From: Andrea Zagli Date: Sat, 30 May 2015 14:30:20 +0000 (+0200) Subject: It runs with gtk3. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=e093242ee010da12c1a9f336c0791e98c94bfefd;p=reptool%2Fgreptool It runs with gtk3. --- diff --git a/data/greptool/ui/greptool.ui b/data/greptool/ui/greptool.ui index 1521890..c537d55 100644 --- a/data/greptool/ui/greptool.ui +++ b/data/greptool/ui/greptool.ui @@ -324,93 +324,87 @@ - + True False - + True False - - - True - False - gtk-new - - - - False - True - - - - - True - False - gtk-open - - - - False - True - - - - - True - False - gtk-save - - - - False - True - - - - - True - False - - - False - False - - - - - True - False - gtk-cut - - - False - True - - - - - True - False - gtk-copy - - - False - True - - - - - True - False - gtk-paste - - - False - True - - + gtk-new + + + + False + True + + + + + True + False + gtk-open + + + + False + True + + + + + True + False + gtk-save + + + + False + True + + + + + True + False + + + False + False + + + + + True + False + gtk-cut + + + False + True + + + + + True + False + gtk-copy + + False + True + + + + + True + False + gtk-paste + + + False + True + @@ -420,101 +414,96 @@ - + True False - + True False - - - True - False - Selector - True - - - False - True - - - - - True - False - - - False - False - - - - - True - False - Text - True - rtbtn_select - - - False - True - - - - - True - False - Line - True - rtbtn_select - - - False - True - - - - - True - False - Rectangle - True - rtbtn_select - - - False - True - - - - - True - False - Ellipse - True - rtbtn_select - - - False - True - - - - - True - False - Image - True - rtbtn_select - - - False - True - - + Selector + True + True + + + False + True + + + + + True + False + + + False + False + + + + + True + False + Text + True + rtbtn_select + + + False + True + + + + + True + False + Line + True + rtbtn_select + + + False + True + + + + + True + False + Rectangle + True + rtbtn_select + + + False + True + + + + + True + False + Ellipse + True + rtbtn_select + + + False + True + + + + + True + False + Image + True + rtbtn_select + + False + True + @@ -524,7 +513,7 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -532,10 +521,11 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical @@ -623,12 +613,10 @@ You should have received a copy of the GNU General Public License along with Nau 3 vertical - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - 2 3 @@ -639,50 +627,47 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL + 0 + 0 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - X - 0 - 1 - 2 - GTK_FILL + 1 + 0 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Y - 0 + 2 - 2 - 3 - GTK_FILL + 1 + 1 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 1 - 2 + 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -690,13 +675,11 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - 1 - 2 + 3 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -704,65 +687,58 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - 2 - 3 + 4 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Width - 0 + 2 - 3 - 4 - GTK_FILL + 1 + 5 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Height + Y 0 - 4 - 5 - GTK_FILL + 0 + 2 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + Width + 0 - 1 - 2 + 0 3 - 4 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + Height + 0 - 1 - 2 + 0 4 - 5 @@ -774,23 +750,21 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 5 - 6 - GTK_FILL - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + X + 0 - 1 - 2 - 5 - 6 + 0 + 1 @@ -837,14 +811,12 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - 3 3 + 3 True @@ -854,10 +826,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 1 - 2 - GTK_FILL - @@ -869,10 +839,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 1 2 - 3 - GTK_FILL - @@ -884,7 +852,6 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 @@ -897,9 +864,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 2 - 3 @@ -911,8 +876,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 2 + 0 @@ -924,9 +889,21 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 + + + + + + + + + + + + @@ -952,14 +929,12 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 2 - 3 3 + 3 True @@ -969,8 +944,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 @@ -982,10 +957,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 1 1 - 2 - GTK_FILL - @@ -997,10 +970,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 2 2 - 3 - GTK_FILL - @@ -1012,10 +983,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 2 3 - 4 - GTK_FILL - @@ -1027,7 +996,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -1039,9 +1008,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 @@ -1053,9 +1020,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 2 - 3 @@ -1067,11 +1032,24 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 3 - 4 + + + + + + + + + + + + + + + @@ -1097,12 +1075,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 True @@ -1114,9 +1090,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 1 - 2 @@ -1130,9 +1104,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 @@ -1145,9 +1117,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 @@ -1159,8 +1129,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 4 1 - 2 @@ -1172,7 +1142,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 4 + 0 @@ -1183,6 +1153,28 @@ You should have received a copy of the GNU General Public License along with Nau Height 0 + + 5 + 0 + + + + + + + + + + + + + + + + + + + @@ -1209,12 +1201,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 True @@ -1226,9 +1216,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 1 - 2 @@ -1242,9 +1230,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 @@ -1257,9 +1243,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 @@ -1271,8 +1255,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 4 1 - 2 @@ -1284,7 +1268,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 4 + 0 @@ -1295,6 +1279,28 @@ You should have received a copy of the GNU General Public License along with Nau Height 0 + + 5 + 0 + + + + + + + + + + + + + + + + + + + @@ -1383,13 +1389,11 @@ You should have received a copy of the GNU General Public License along with Nau False 12 - + True False - 3 - 2 - 4 3 + 4 True @@ -1398,8 +1402,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 @@ -1410,10 +1414,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 1 1 - 2 - GTK_FILL - @@ -1424,10 +1426,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 2 2 - 3 - GTK_FILL - @@ -1444,9 +1444,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 2 - 3 @@ -1456,9 +1454,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL - GTK_FILL + 0 @@ -1468,12 +1464,21 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - + + + + + + + + + + + + @@ -1498,13 +1503,11 @@ You should have received a copy of the GNU General Public License along with Nau False 12 - + True False - 2 - 2 - 3 3 + 3 True @@ -1513,8 +1516,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 @@ -1526,8 +1529,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - + 0 @@ -1538,10 +1540,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 2 1 - 2 - GTK_FILL - @@ -1555,13 +1555,15 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - GTK_FILL - + + + + + + @@ -1586,13 +1588,11 @@ You should have received a copy of the GNU General Public License along with Nau False 12 - + True False - 2 - 2 - 3 3 + 3 True @@ -1601,8 +1601,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 @@ -1614,8 +1614,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - + 0 @@ -1626,10 +1625,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 2 1 - 2 - GTK_FILL - @@ -1643,13 +1640,15 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - GTK_FILL - + + + + + + @@ -1733,30 +1732,21 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 3 - - - True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 1 - 2 - GTK_FILL @@ -1767,23 +1757,20 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Style + Width 0 - 2 - 3 - GTK_FILL - GTK_FILL + 0 + 0 @@ -1795,25 +1782,26 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 1 - 2 - GTK_FILL - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Width + Style 0 - GTK_FILL - GTK_FILL + 0 + 2 + + + @@ -1826,11 +1814,10 @@ You should have received a copy of the GNU General Public License along with Nau - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 3 @@ -1838,12 +1825,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 - GTK_FILL + 0 @@ -1855,8 +1840,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - GTK_FILL + 0 + 0 @@ -1911,12 +1896,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 3 @@ -1926,9 +1909,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 1 - 2 @@ -1939,7 +1920,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 + 0 @@ -1950,9 +1931,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 @@ -1963,7 +1942,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -1976,10 +1955,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL @@ -1992,34 +1968,33 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom + Top 0 - 1 - 2 - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Top + Bottom 0 - GTK_FILL + 0 + 1 @@ -2047,12 +2022,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 3 @@ -2060,14 +2033,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 3 - 4 1 - 2 - GTK_FILL @@ -2076,12 +2045,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 3 - 4 - GTK_FILL + 0 @@ -2090,14 +2057,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 1 - 2 - GTK_FILL @@ -2106,12 +2069,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 - GTK_FILL + 0 @@ -2124,54 +2085,46 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom + Right 0 - 1 - 2 - GTK_FILL - GTK_FILL + 2 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Right + Top 0 - 2 - 3 - GTK_FILL - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Top + Bottom 0 - GTK_FILL - GTK_FILL + 0 + 1 @@ -2199,31 +2152,11 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 3 - - - - - - - - - - - - - - - - - - True @@ -2234,10 +2167,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL @@ -2250,8 +2180,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 - GTK_FILL + 0 @@ -2263,9 +2192,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 6 1 - 2 - GTK_FILL @@ -2277,9 +2205,46 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL + 7 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2316,11 +2281,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 3 @@ -2337,7 +2301,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -2349,10 +2313,13 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - GTK_FILL + 2 + 0 + + + @@ -2365,11 +2332,10 @@ You should have received a copy of the GNU General Public License along with Nau - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 3 @@ -2379,8 +2345,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 @@ -2392,8 +2357,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - GTK_FILL + 0 + 0 @@ -2429,30 +2394,21 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 3 - - - True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 1 - 2 - GTK_FILL @@ -2463,23 +2419,20 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Style + Width 0 - 2 - 3 - GTK_FILL - GTK_FILL + 0 + 0 @@ -2491,25 +2444,26 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 1 - 2 - GTK_FILL - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Width + Style 0 - GTK_FILL - GTK_FILL + 0 + 2 + + + @@ -2547,30 +2501,21 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 3 - - - True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 1 - 2 - GTK_FILL @@ -2581,23 +2526,20 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Style + Width 0 - 2 - 3 - GTK_FILL - GTK_FILL + 0 + 0 @@ -2609,25 +2551,26 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 1 - 2 - GTK_FILL - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Width + Style 0 - GTK_FILL - GTK_FILL + 0 + 2 + + + @@ -2640,11 +2583,10 @@ You should have received a copy of the GNU General Public License along with Nau - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 3 @@ -2652,12 +2594,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 - GTK_FILL + 0 @@ -2669,8 +2609,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - GTK_FILL + 0 + 0 @@ -2717,12 +2657,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 3 @@ -2732,9 +2670,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 1 - 2 @@ -2745,7 +2681,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 + 0 @@ -2756,9 +2692,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 @@ -2769,7 +2703,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -2782,10 +2716,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL @@ -2798,34 +2729,33 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom + Top 0 - 1 - 2 - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Top + Bottom 0 - GTK_FILL + 0 + 1 @@ -2853,12 +2783,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 3 @@ -2866,14 +2794,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 3 - 4 1 - 2 - GTK_FILL @@ -2882,12 +2806,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 3 - 4 - GTK_FILL + 0 @@ -2896,14 +2818,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 1 - 2 - GTK_FILL @@ -2912,12 +2830,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 - GTK_FILL + 0 @@ -2930,50 +2846,46 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom + Right 0 - 1 - 2 - GTK_FILL + 2 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Right + Top 0 - 2 - 3 - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Top + Bottom 0 - GTK_FILL + 0 + 1 @@ -3001,31 +2913,11 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 - 3 - - - - - - - - - - - - - - - - - - + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 True @@ -3036,10 +2928,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL @@ -3052,8 +2941,7 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 - GTK_FILL + 0 @@ -3065,9 +2953,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 6 1 - 2 - GTK_FILL @@ -3079,9 +2966,46 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL + 7 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3108,28 +3032,22 @@ You should have received a copy of the GNU General Public License along with Nau - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - 3 3 + 3 True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 2 - 3 - GTK_FILL @@ -3143,67 +3061,59 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - GTK_FILL - + True - False + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Color - 0 + Sans 12 - 2 - 3 - GTK_FILL - GTK_FILL + 1 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Strike + Font 0 - 1 - 2 - GTK_FILL - GTK_FILL + 0 + 0 - + True - True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Sans 12 + Strike + 0 - 1 - 2 - GTK_FILL + 0 + 1 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Font + Color 0 - GTK_FILL - GTK_FILL + 0 + 2 @@ -3243,12 +3153,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 3 @@ -3258,10 +3166,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - GTK_FILL @@ -3272,36 +3177,33 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Vertical + Horizontal 0 - 1 - 2 - GTK_FILL - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Horizontal + Vertical 0 - GTK_FILL - GTK_FILL + 0 + 1 @@ -3329,11 +3231,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 3 @@ -3350,7 +3251,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -3362,9 +3263,13 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL + 2 + 0 + + + @@ -3390,12 +3295,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 2 3 @@ -3411,12 +3314,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 - 4 2 @@ -3426,10 +3327,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 1 - 2 - GTK_FILL @@ -3440,8 +3338,7 @@ You should have received a copy of the GNU General Public License along with Nau 3 - 4 - GTK_FILL + 0 @@ -3452,10 +3349,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 1 - 2 - GTK_FILL @@ -3466,8 +3360,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - GTK_FILL + 0 @@ -3480,54 +3373,46 @@ You should have received a copy of the GNU General Public License along with Nau 2 - 3 1 - 2 - GTK_FILL - GTK_FILL - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom + Right 0 - 1 - 2 - GTK_FILL - GTK_FILL + 2 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Right + Top 0 - 2 - 3 - GTK_FILL - GTK_FILL + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Top + Bottom 0 - GTK_FILL - GTK_FILL + 0 + 1 @@ -3536,10 +3421,8 @@ You should have received a copy of the GNU General Public License along with Nau - 2 + 0 1 - 2 - GTK_FILL @@ -3548,12 +3431,10 @@ You should have received a copy of the GNU General Public License along with Nau True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - #000000000000 1 - 2 - GTK_FILL + 0 @@ -3565,10 +3446,13 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - GTK_FILL + 0 + 0 + + + @@ -3672,42 +3556,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True @@ -3716,7 +3568,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -3727,6 +3579,10 @@ You should have received a copy of the GNU General Public License along with Nau Size 0 + + 0 + 0 + @@ -3799,14 +3655,12 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - 3 3 + 3 True @@ -3816,29 +3670,24 @@ You should have received a copy of the GNU General Public License along with Nau 0 + 0 1 - 2 - GTK_FILL - - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Height - 0 + 2 - 2 - 3 - GTK_FILL - + 1 + 1 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3846,23 +3695,18 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 - 1 - 2 + 2 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 1 - 2 - 2 - 3 + 0 @@ -3874,19 +3718,21 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Height + 0 - 1 - 2 + 0 + 2 @@ -3914,14 +3760,12 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 - 2 - 3 3 + 3 True @@ -3931,57 +3775,48 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Right - 0 + 2 - 1 - 2 - GTK_FILL - + 1 + 0 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Bottom - 0 + 2 - 2 - 3 - GTK_FILL - + 1 + 1 - + True - False + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Left - 0 + 2 - 3 - 4 - GTK_FILL - + 1 + 2 - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -3989,49 +3824,46 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 3 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + Left + 0 - 1 - 2 - 1 - 2 + 0 + 3 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + Bottom + 0 - 1 - 2 + 0 2 - 3 - + True - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + Right + 0 - 1 - 2 - 3 - 4 + 0 + 1 @@ -4070,42 +3902,10 @@ You should have received a copy of the GNU General Public License along with Nau GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True @@ -4116,7 +3916,7 @@ You should have received a copy of the GNU General Public License along with Nau 1 - 2 + 0 @@ -4128,8 +3928,8 @@ You should have received a copy of the GNU General Public License along with Nau 0 - GTK_FILL - + 0 + 0 diff --git a/src/Makefile.am b/src/Makefile.am index bfb0300..2d356f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -gladedir = $(datadir)/greptool/glade +gladedir = $(datadir)/greptool/ui iconsdir = $(datadir)/greptool/pixmaps AM_CPPFLAGS = $(GREPTOOL_CFLAGS) \ diff --git a/src/main.c b/src/main.c index 39040af..7df028c 100644 --- a/src/main.c +++ b/src/main.c @@ -285,21 +285,21 @@ report_save_as () } /* SIGNALS */ -void +G_MODULE_EXPORT void on_mnu_file_new_activate (GtkMenuItem *menuitem, gpointer user_data) { report_new (); } -void +G_MODULE_EXPORT void on_mnu_file_open_activate (GtkMenuItem *menuitem, gpointer user_data) { report_open (); } -void +G_MODULE_EXPORT void on_mnu_file_save_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -313,14 +313,14 @@ on_mnu_file_save_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnu_file_save_as_activate (GtkMenuItem *menuitem, gpointer user_data) { report_save_as (); } -void +G_MODULE_EXPORT void on_mnu_file_close_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -331,7 +331,7 @@ on_mnu_file_close_activate (GtkMenuItem *menuitem, gtk_window_set_title (GTK_WINDOW (w), "GRepTool"); } -void +G_MODULE_EXPORT void on_mnu_edit_delete_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -343,41 +343,41 @@ on_mnu_edit_delete_activate (GtkMenuItem *menuitem, } } -void +G_MODULE_EXPORT void on_mnu_edit_select_all_activate (GtkMenuItem *menuitem, gpointer user_data) { grpt_canvas_select_all (grpt_canvas); } -void +G_MODULE_EXPORT void on_mnu_edit_select_none_activate (GtkMenuItem *menuitem, gpointer user_data) { grpt_canvas_select_none (grpt_canvas); } -void +G_MODULE_EXPORT void on_mnu_edit_report_properties_activate (GtkMenuItem *menuitem, gpointer user_data) { report_properties (rpt_report); } -void +G_MODULE_EXPORT void on_mnu_edit_page_properties_activate (GtkMenuItem *menuitem, gpointer user_data) { page_properties (grpt_canvas); } -void +G_MODULE_EXPORT void on_mnu_edit_object_properties_activate (GtkMenuItem *menuitem, gpointer user_data) { } -void +G_MODULE_EXPORT void on_mnu_view_objects_tree_toggled (GtkCheckMenuItem *checkmenuitem, gpointer user_data) { @@ -392,7 +392,7 @@ on_mnu_view_objects_tree_toggled (GtkCheckMenuItem *checkmenuitem, } } -void +G_MODULE_EXPORT void on_mnu_help_about_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -408,21 +408,21 @@ on_mnu_help_about_activate (GtkMenuItem *menuitem, gtk_widget_destroy (diag); } -void +G_MODULE_EXPORT void on_tbtn_new_clicked (GtkToolButton *toolbutton, gpointer user_data) { report_new (); } -void +G_MODULE_EXPORT void on_tbtn_open_clicked (GtkToolButton *toolbutton, gpointer user_data) { report_open (); } -void +G_MODULE_EXPORT void on_tbtn_save_clicked (GtkToolButton *toolbutton, gpointer user_data) { diff --git a/src/page_properties.c b/src/page_properties.c index 4bc6a1c..6eaf69e 100644 --- a/src/page_properties.c +++ b/src/page_properties.c @@ -63,8 +63,8 @@ page_properties_find_cb_page_size () static void page_properties_set_size_sensibility () { - gchar *text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (cb_size_type)); - gboolean sens = (text != NULL && strcmp (text, "Custom") == 0); + gchar *text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (cb_size_type)); + gboolean sens = (text != NULL && g_strcmp0 (text, "Custom") == 0); gtk_widget_set_sensitive (spn_height, sens); gtk_widget_set_sensitive (spn_width, sens); @@ -148,7 +148,7 @@ void page_properties_on_cb_size_type_changed (GtkComboBox *widget, gpointer user_data) { - gchar *text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (cb_size_type)); + gchar *text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (cb_size_type)); page_properties_set_size_sensibility (); diff --git a/src/report_properties.c b/src/report_properties.c index c05e5d2..f0fed40 100644 --- a/src/report_properties.c +++ b/src/report_properties.c @@ -38,20 +38,26 @@ static GtkListStore *store_providers; static void report_properties_fill_providers () { - GtkTreeIter iter; + GtkTreeIter titer; + GdaDataModelIter *iter; /* fill providers list */ - GList *providers = gda_config_get_provider_list (); + GdaDataModel *providers = gda_config_list_providers (); if (providers != NULL) { - do { - GdaProviderInfo *pi = (GdaProviderInfo *)providers->data; + iter = gda_data_model_create_iter (providers); + gda_data_model_iter_move_next (iter); + while (gda_data_model_iter_is_valid (iter)) { + GdaProviderInfo *pi = gda_config_get_provider_info (g_value_get_string (gda_data_model_iter_get_value_at (iter, 0))); + + gtk_list_store_append (store_providers, &titer); + gtk_list_store_set (store_providers, &titer, 0, pi->id, -1); - gtk_list_store_append (store_providers, &iter); - gtk_list_store_set (store_providers, &iter, 0, pi->id, -1); - } while ((providers = g_list_next (providers)) != NULL); + gda_data_model_iter_move_next (iter); + } - gda_config_free_provider_list (providers); + g_object_unref (iter); + g_object_unref (providers); } }