diff --git a/gtk/gtkbuilder/dialog_authentication.ui b/gtk/gtkbuilder/dialog_authentication.ui index 278dde91..8f916e6f 100644 --- a/gtk/gtkbuilder/dialog_authentication.ui +++ b/gtk/gtkbuilder/dialog_authentication.ui @@ -65,6 +65,7 @@ True False Username + entry_username 0 @@ -76,6 +77,7 @@ True False Password + entry_password 0 diff --git a/gtk/gtkbuilder/dialog_change_version.ui b/gtk/gtkbuilder/dialog_change_version.ui index c313e0ee..68eae9b8 100644 --- a/gtk/gtkbuilder/dialog_change_version.ui +++ b/gtk/gtkbuilder/dialog_change_version.ui @@ -107,6 +107,7 @@ True False Force version: + combobox_available_versions False diff --git a/gtk/gtkbuilder/dialog_changelog.ui b/gtk/gtkbuilder/dialog_changelog.ui index 30b69e3e..9ba6d5ce 100644 --- a/gtk/gtkbuilder/dialog_changelog.ui +++ b/gtk/gtkbuilder/dialog_changelog.ui @@ -57,6 +57,7 @@ Complete changelog of the latest version: True 0 + textview_changelog False @@ -78,7 +79,10 @@ False 3 3 - False + True + diff --git a/gtk/gtkbuilder/dialog_conffile.ui b/gtk/gtkbuilder/dialog_conffile.ui index 33d45649..f9bd38b0 100644 --- a/gtk/gtkbuilder/dialog_conffile.ui +++ b/gtk/gtkbuilder/dialog_conffile.ui @@ -136,7 +136,10 @@ True True False - False + True + @@ -153,6 +156,7 @@ True False Difference between the files + textview_diff diff --git a/gtk/gtkbuilder/dialog_disc_label.ui b/gtk/gtkbuilder/dialog_disc_label.ui index f45a09ef..567b47b0 100644 --- a/gtk/gtkbuilder/dialog_disc_label.ui +++ b/gtk/gtkbuilder/dialog_disc_label.ui @@ -1,5 +1,6 @@ + @@ -112,6 +113,7 @@ The label will be used if you want to install packages from this CD-Rom. It is r True False Label: + entry1 False diff --git a/gtk/gtkbuilder/dialog_download_error.ui b/gtk/gtkbuilder/dialog_download_error.ui index 37703507..ecd020f2 100644 --- a/gtk/gtkbuilder/dialog_download_error.ui +++ b/gtk/gtkbuilder/dialog_download_error.ui @@ -1,6 +1,7 @@ + @@ -83,6 +84,7 @@ The version of the package that you want to install might be no longer available True True 0 + textview False @@ -104,7 +106,10 @@ The version of the package that you want to install might be no longer available 2 False word - False + True + diff --git a/gtk/gtkbuilder/dialog_new_repositroy.ui b/gtk/gtkbuilder/dialog_new_repositroy.ui index 6f39ea17..83594560 100644 --- a/gtk/gtkbuilder/dialog_new_repositroy.ui +++ b/gtk/gtkbuilder/dialog_new_repositroy.ui @@ -1,5 +1,6 @@ + diff --git a/gtk/gtkbuilder/dialog_task_descr.ui b/gtk/gtkbuilder/dialog_task_descr.ui index 4f46b65f..40673c3e 100644 --- a/gtk/gtkbuilder/dialog_task_descr.ui +++ b/gtk/gtkbuilder/dialog_task_descr.ui @@ -65,7 +65,10 @@ word 3 3 - False + True + diff --git a/gtk/gtkbuilder/dialog_unmet.ui b/gtk/gtkbuilder/dialog_unmet.ui index 3c2ae3da..5602fd95 100644 --- a/gtk/gtkbuilder/dialog_unmet.ui +++ b/gtk/gtkbuilder/dialog_unmet.ui @@ -101,7 +101,10 @@ The following packages have unresolvable dependencies. Make sure that all requir 2 False word - False + True + diff --git a/gtk/gtkbuilder/dialog_update_failed.ui b/gtk/gtkbuilder/dialog_update_failed.ui index 6d629d38..8a9ff227 100644 --- a/gtk/gtkbuilder/dialog_update_failed.ui +++ b/gtk/gtkbuilder/dialog_update_failed.ui @@ -103,7 +103,10 @@ The repository may no longer be available or could not be contacted because of n 2 False word - False + True + diff --git a/gtk/gtkbuilder/window_details.ui b/gtk/gtkbuilder/window_details.ui index 10a2679d..d488910c 100644 --- a/gtk/gtkbuilder/window_details.ui +++ b/gtk/gtkbuilder/window_details.ui @@ -73,6 +73,7 @@ 0 <b>Package:</b> True + textview_pkgcommon GTK_FILL @@ -105,6 +106,7 @@ <b>Section:</b> True right + label_section 4 @@ -121,6 +123,7 @@ 0 <b>Priority:</b> True + label_priority 3 @@ -154,6 +157,7 @@ <b>Maintainer:</b> True right + label_maintainer 2 @@ -171,6 +175,7 @@ <b>Status:</b> True right + label_state 1 @@ -236,8 +241,11 @@ word 3 3 - False + True textbuffer1 + @@ -253,6 +261,7 @@ 0 <b>Tags:</b> True + label_tags 5 @@ -299,6 +308,7 @@ True <b>Source:</b> True + label_source 6 @@ -332,12 +342,12 @@ - - vertical + True False - 6 - + 0 + none + True False @@ -345,29 +355,12 @@ <b>Installed Version</b> True - - False - False - 0 - horizontal True False - - - True - False - - - - False - False - 0 - - True @@ -376,12 +369,14 @@ 2 12 6 + 20 True False 0 Size: + label_installed_size 1 @@ -396,6 +391,7 @@ False 0 Version: + label_installed_version GTK_FILL @@ -440,26 +436,16 @@ - - True - True - 1 - - - False - False - 1 - - - vertical + True False - 6 - + 0 + none + True False @@ -467,29 +453,12 @@ <b>Latest Available Version</b> True - - False - False - 0 - horizontal True False - - - True - False - - - - False - False - 0 - - True @@ -498,12 +467,14 @@ 2 12 6 + 20 True False 0 Download: + label_latest_download_size 2 @@ -518,6 +489,7 @@ False 0 Size: + label_latest_size 1 @@ -532,6 +504,7 @@ False 0 Version: + label_latest_version GTK_FILL @@ -585,18 +558,8 @@ - - True - True - 1 - - - True - True - 1 - @@ -863,7 +826,15 @@ False 3 3 - False + True + + + Installed Files + + + @@ -896,6 +867,7 @@ 0 Available versions: True + treeview_versions False @@ -1042,7 +1014,15 @@ word 3 3 - False + True + + + + Description + + diff --git a/gtk/gtkbuilder/window_filters.ui b/gtk/gtkbuilder/window_filters.ui index 76d6eba3..160e3a0b 100644 --- a/gtk/gtkbuilder/window_filters.ui +++ b/gtk/gtkbuilder/window_filters.ui @@ -118,6 +118,11 @@ True + + + Filters + + False @@ -247,12 +252,12 @@ False 18 - - vertical + True False - 6 - + 0 + none + True False @@ -260,310 +265,20 @@ <b>Current</b> True - - False - False - 0 - - - - - horizontal - True - False - - - True - False - - - - False - False - 0 - - - - - vertical - True - False - - - Installed - True - True - False - Installed packages that are up-to-date - True - 0.5 - True - - - False - False - 0 - - - - - Upgradable - True - True - False - Installed packages that are upgradable - True - 0.5 - True - - - False - False - 1 - - - - - Upgradable (upstream) - True - True - False - Installed packages that are upgradable to a later upstream version - True - 0.5 - True - - - False - False - 2 - - - - - Residual config - True - True - False - Removed packages that have left configuration files on the system - True - 0.5 - True - - - False - False - 3 - - - - - Not installed - True - True - False - Not installed packages - True - 0.5 - True - - - False - False - 4 - - - - - False - False - 1 - - - - - True - True - 1 - - - - - False - False - 0 - - - - - vertical - True - False - 6 - - - True - False - 0 - <b>Marked</b> - True - - - False - False - 0 - - - horizontal - True - False - - - True - False - - - - False - False - 0 - - - - - vertical - True - False - - - Not marked - True - True - False - Packages that won't be changed - True - 0.5 - True - - - False - False - 0 - - - - - For installation or upgrade - True - True - False - Packages that will be installed or upgraded - True - 0.5 - True - - - False - False - 1 - - - - - For removal - True - True - False - Packages that will be removed - True - 0.5 - True - - - False - False - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - False - False - 1 - - - - - True - True - 0 - - - - - vertical - True - False - 6 - - - True - False - 0 - <b>Other</b> - True - - - False - False - 0 - - - - - horizontal - True - False - - - True - False - - - - False - False - 0 - - - - + vertical True False + 20 - - New in repository + + Installed True True False - Packages that are new in the repository since that last "Reload" + Installed packages that are up-to-date True 0.5 True @@ -575,12 +290,12 @@ - - Pinned + + Upgradable True True False - Packages that will never be upgraded + Installed packages that are upgradable True 0.5 True @@ -592,12 +307,12 @@ - - Orphaned + + Upgradable (upstream) True True False - Library packages that are no longer needed (deborphan is required) + Installed packages that are upgradable to a later upstream version True 0.5 True @@ -609,12 +324,12 @@ - - Not installable + + Residual config True True False - Packages that are not available in any repository + Removed packages that have left configuration files on the system True 0.5 True @@ -626,12 +341,12 @@ - - Broken + + Not installed True True False - Packages with broken dependencies + Not installed packages True 0.5 True @@ -642,30 +357,38 @@ 4 + + + + + + + True + False + 0 + none + + + True + False + 0 + <b>Marked</b> + True + + + + + vertical + True + False + 20 - - Automatic install - True - True - False - Packages installed automatically as part of a dependency - True - 0.5 - True - - - False - False - 5 - - - - - Automatic removable + + Not marked True True False - Packages installed automatically but no longer required by any other package + Packages that won't be changed True 0.5 True @@ -673,16 +396,16 @@ False False - 6 + 0 - - Policy broken + + For installation or upgrade True True False - Currently in broken policy state + Packages that will be installed or upgraded True 0.5 True @@ -690,16 +413,16 @@ False False - 7 + 1 - - Manual installed + + For removal True True False - Packages installed manually (not as a dependency of something else) + Packages that will be removed True 0.5 True @@ -707,43 +430,196 @@ False False - 8 + 2 + + + + + + + + True + False + 0 + none + + + True + False + 0 + <b>Other</b> + True + + + + + vertical + True + False + 20 + + + New in repository + True + True + False + Packages that are new in the repository since that last "Reload" + True + 0.5 + True + + + False + False + 0 + + + + + Pinned + True + True + False + Packages that will never be upgraded + True + 0.5 + True + False False 1 + + + Orphaned + True + True + False + Library packages that are no longer needed (deborphan is required) + True + 0.5 + True + + + False + False + 2 + + + + + Not installable + True + True + False + Packages that are not available in any repository + True + 0.5 + True + + + False + False + 3 + + + + + Broken + True + True + False + Packages with broken dependencies + True + 0.5 + True + + + False + False + 4 + + + + + Automatic install + True + True + False + Packages installed automatically as part of a dependency + True + 0.5 + True + + + False + False + 5 + + + + + Automatic removable + True + True + False + Packages installed automatically but no longer required by any other package + True + 0.5 + True + + + False + False + 6 + + + + + Policy broken + True + True + False + Currently in broken policy state + True + 0.5 + True + + + False + False + 7 + + + + + Manual installed + True + True + False + Packages installed manually (not as a dependency of something else) + True + 0.5 + True + + + False + False + 8 + + - - False - False - 1 - - - True - True - 1 - - - False - False - 0 - - - True - True - 0 - @@ -1003,6 +879,7 @@ True False Boolean operator between property criterias: + radiobutton_properties_and False diff --git a/gtk/gtkbuilder/window_find.ui b/gtk/gtkbuilder/window_find.ui index 712e88e9..a702972a 100644 --- a/gtk/gtkbuilder/window_find.ui +++ b/gtk/gtkbuilder/window_find.ui @@ -160,6 +160,7 @@ False 0 Search: + comboentry_search GTK_FILL @@ -173,6 +174,7 @@ 0 Look in: True + combo_lookin 1 diff --git a/gtk/gtkbuilder/window_logview.ui b/gtk/gtkbuilder/window_logview.ui index ba3df99b..dde06a53 100644 --- a/gtk/gtkbuilder/window_logview.ui +++ b/gtk/gtkbuilder/window_logview.ui @@ -110,7 +110,10 @@ False word 6 - False + True + @@ -134,6 +137,11 @@ True True + + + Find + + True diff --git a/gtk/gtkbuilder/window_main.ui b/gtk/gtkbuilder/window_main.ui index 3bb2e84f..5c8391b3 100644 --- a/gtk/gtkbuilder/window_main.ui +++ b/gtk/gtkbuilder/window_main.ui @@ -993,7 +993,10 @@ 12 12 6 - False + True + @@ -1020,13 +1023,10 @@ none + vertical True False - 12 - 12 - 12 - 12 - vertical + 12 18 @@ -1040,10 +1040,11 @@ True False - <b>Package:</b> - True 0 0 + <b>Package:</b> + True + textview_pkgcommon GTK_FILL @@ -1054,8 +1055,9 @@ True False - True 0 + True + True 1 @@ -1070,11 +1072,12 @@ True False + 0 + 0 <b>Section:</b> True right - 0 - 0 + label_section 4 @@ -1087,10 +1090,11 @@ True False - <b>Priority:</b> - True 0 0 + <b>Priority:</b> + True + label_priority 3 @@ -1104,6 +1108,7 @@ True False 0 + True 1 @@ -1118,11 +1123,12 @@ True False + 0 + 0 <b>Maintainer:</b> True right - 1 - 0 + label_maintainer 2 @@ -1135,11 +1141,12 @@ True False + 0 + 0 <b>Status:</b> True right - 0 - 0 + label_state 1 @@ -1150,6 +1157,7 @@ + horizontal True False 6 @@ -1169,6 +1177,7 @@ True False + True False @@ -1203,7 +1212,10 @@ word 3 3 - False + True + @@ -1216,9 +1228,10 @@ False + 0 <b>Tags:</b> True - 0 + label_tags 5 @@ -1242,31 +1255,32 @@ - + True - False - <b>Source:</b> - True + True 0 + True + True - 6 - 7 + 1 + 2 + 2 + 3 GTK_FILL - - True + False - True - True 0 + True + <b>Source:</b> + True + label_source - 1 - 2 6 7 GTK_FILL @@ -1274,18 +1288,18 @@ - + True - True - True - True + False 0 + True + True 1 2 - 2 - 3 + 6 + 7 GTK_FILL @@ -1298,41 +1312,25 @@ - + True False - vertical - 6 - + 0 + none + True False + 0 <b>Installed Version</b> True - 0 - - False - False - 0 - + horizontal True False - - - True - False - - - - False - False - 0 - - True @@ -1341,12 +1339,14 @@ 2 12 6 + 20 True False - Size: 0 + Size: + label_installed_size 1 @@ -1359,8 +1359,9 @@ True False - Version: 0 + Version: + label_installed_version GTK_FILL @@ -1372,6 +1373,7 @@ True False 0 + True 1 @@ -1384,8 +1386,8 @@ True False - True 0 + True 1 @@ -1404,55 +1406,29 @@ - - True - True - 1 - - - False - False - 1 - - + True False - vertical - 6 - + 0 + none + True False + 0 <b>Latest Available Version</b> True - 0 - - False - False - 0 - + horizontal True False - - - True - False - - - - False - False - 0 - - True @@ -1461,12 +1437,14 @@ 2 12 6 + 20 True False - Download: 0 + Download: + label_latest_download_size 2 @@ -1479,8 +1457,9 @@ True False - Size: 0 + Size: + label_latest_size 1 @@ -1493,8 +1472,9 @@ True False - Version: 0 + Version: + label_latest_version GTK_FILL @@ -1506,6 +1486,7 @@ True False 0 + True 1 @@ -1518,8 +1499,8 @@ True False - True 0 + True 1 @@ -1535,6 +1516,7 @@ True False 0 + True 1 @@ -1546,18 +1528,8 @@ - - True - True - 1 - - - True - True - 1 - @@ -1836,7 +1808,15 @@ False 3 3 - False + True + + + Installed Files + + + diff --git a/gtk/gtkbuilder/window_preferences.ui b/gtk/gtkbuilder/window_preferences.ui index e7df2b41..f0ea7ce8 100644 --- a/gtk/gtkbuilder/window_preferences.ui +++ b/gtk/gtkbuilder/window_preferences.ui @@ -86,12 +86,12 @@ 12 18 - - vertical + True False - 6 - + 0 + none + True False @@ -99,22 +99,24 @@ <b>Appearance</b> True - - False - False - 0 - - - horizontal + + vertical True False + 6 + 20 - + + Show package properties in the main window True - False - + True + False + 2 + True + 0.5 + True False @@ -122,57 +124,17 @@ 0 - - - vertical - True - False - 6 - - - Show package properties in the main window - True - True - False - 2 - True - 0.5 - True - - - False - False - 0 - - - - - False - False - 1 - - - - False - False - 1 - - - False - False - 0 - - - vertical + True False - 6 - + 0 + none + True False @@ -180,22 +142,25 @@ <b>Marking Changes</b> True - - False - False - 0 - - - horizontal + + vertical True False + 2 + 6 + 20 - + + Ask to confirm changes that also affect other packages True - False - + True + False + 2 + True + 0.5 + True False @@ -204,240 +169,180 @@ - - vertical + + Consider recommended packages as dependencies True - False + True + False 2 - 6 + True + 0.5 + True + + + False + False + 1 + + + + + Clicking on the status icon marks the most likely action + True + True + False + 2 + True + 0.5 + True + + + False + False + 2 + + + + + True + False + 4 + 2 + 12 + 6 - - Ask to confirm changes that also affect other packages + True - True - False - 2 + False + 0 + Removal of packages: True - 0.5 - True + combo_removal_action - False - False - 0 + GTK_FILL + - - Consider recommended packages as dependencies + True - True - False - 2 - True - 0.5 - True + False + ls_removal_action - False - False - 1 + 1 + 2 + GTK_FILL + GTK_FILL - - Clicking on the status icon marks the most likely action + True - True - False - 2 - True - 0.5 - True + False + 0 + System upgrade: + combo_upgrade_method - False - False - 2 + 1 + 2 + GTK_FILL + - + + horizontal True False - 4 - 2 - 12 - 6 - - - True - False - 0 - Removal of packages: - True - - - GTK_FILL - - - - - - True - False - ls_removal_action - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - System upgrade: - - - 1 - 2 - GTK_FILL - - - True False 0 Number of undo operations: + spinbutton_max_undos - - 3 - 4 - GTK_FILL - - - - - - horizontal - True - False - - - True - True - adjustment1 - 1 - - - False - True - 0 - - - - - True - False - - - - True - True - 1 - - - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Reloading outdated package information: - - - 2 - 3 - GTK_FILL - - - - - - True - False - ls_upgrade_method - - - 1 - 2 - 1 - 2 - - + True - False - ls_update_ask + True + adjustment1 + 1 + 5 - 1 - 2 - 2 - 3 + False + True + 1 - True - True - 3 + 0 + 3 + 4 + GTK_FILL + GTK_FILL - - - True - True - 1 - - - - - True - True - 1 - + + + True + False + 0 + Reloading outdated package information: + combo_update_ask + + + 2 + 3 + GTK_FILL + + + + + + True + False + ls_upgrade_method + + + 1 + 2 + 1 + 2 + + + + + True + False + ls_update_ask + + + 1 + 2 + 2 + 3 + + + + + - - False - False - 1 - - - vertical + True False - 6 - + 0 + none + True False @@ -445,22 +350,23 @@ <b>Applying Changes</b> True - - False - False - 0 - - - horizontal + + vertical True False + 20 - + + Apply changes in a terminal window True - False - + True + False + 2 + True + 0.5 + True False @@ -469,64 +375,25 @@ - - vertical + + Ask to quit after the changes have been applied successfully True - False - - - Apply changes in a terminal window - True - True - False - 2 - True - 0.5 - True - - - False - False - 0 - - - - - Ask to quit after the changes have been applied successfully - True - True - False - 2 - True - 0.5 - True - - - False - False - 1 - - + True + False + 2 + True + 0.5 + True - True - True + False + False 1 - - True - True - 1 - - - False - True - 2 - @@ -552,12 +419,12 @@ 12 18 - - vertical + True False - 6 - + 0 + none + True False @@ -565,95 +432,66 @@ <b>Columns</b> True - - False - False - 0 - - + horizontal - 174 True False + 12 + 20 - + True - False - + True + in + + + True + True + + + + + - False - False + True + True 0 - - horizontal + + vertical True False - 12 + 6 - + + Move _Up True True - in - - - True - True - - - - - + False + move_up_image + True + - True - True + False + False 0 - - vertical + + Move D_own True - False - 6 - - - Move _Up - True - True - False - move_up_image - True - - - - False - False - 0 - - - - - Move D_own - True - True - False - move_down_image - True - - - - False - False - 1 - - + True + False + move_down_image + True + False @@ -663,32 +501,22 @@ - True - True + False + False 1 - - True - True - 1 - - - False - False - 0 - - - vertical + True False - 6 - + 0 + none + True False @@ -696,201 +524,163 @@ <b>Fonts</b> True - - False - False - 0 - - - horizontal + True False + 2 + 2 + 12 + 6 + 20 - + + Use custom application font True - False - + True + False + True + 0.5 + True + - False - False - 0 + GTK_FILL + - + + Use custom terminal font True - False - 2 - 2 - 12 - 6 - - - Use custom application font - True - True - False - True - 0.5 - True - - - - GTK_FILL - - - - - - Use custom terminal font - True - True - False - True - 0.5 - True - - - - 1 - 2 - GTK_FILL - - - + True + False + True + 0.5 + True + + + + 1 + 2 + GTK_FILL + + + + + + True + True + False + - + True - True - False - + False + 0 + 0 - + + horizontal True False - 0 - 0 + 2 - - horizontal + True False - 2 - - - True - False - font - - - False - False - 0 - - - - - True - False - A_pplication Font - True - - - False - False - 1 - - + font + + False + False + 0 + - - - - - 1 - 2 - - - - - - True - True - False - - - - True - False - 0 - 0 - - horizontal + True False - 2 - - - True - False - font - - - False - False - 0 - - - - - True - False - _Terminal Font - True - - - False - False - 1 - - + A_pplication Font + True - - - + + False + False + 1 + + + + - - 1 - 2 - 1 - 2 - - - True - True - 1 + 1 + 2 + + + + + + True + True + False + + + + True + False + 0 + 0 + + + horizontal + True + False + 2 + + + True + False + font + + + False + False + 0 + + + + + True + False + _Terminal Font + True + + + False + False + 1 + + + + + + + + + 1 + 2 + 1 + 2 + - - True - True - 1 - - - False - False - 1 - @@ -917,12 +707,12 @@ 12 18 - - vertical + True False - 6 - + 0 + none + True False @@ -930,22 +720,24 @@ <b>Colors</b> True - - False - False - 0 - - - horizontal + + vertical True False + 6 + 20 - + + Color packages by their status True - False - + True + False + 2 + True + 0.5 + True False @@ -954,640 +746,600 @@ - - vertical + + horizontal True False - 6 - - Color packages by their status - True - True - False - 2 - True - 0.5 - True - - - False - False - 0 - - - - - horizontal + True False + 7 + 2 + 24 + 6 + + + - + + horizontal True False - 7 - 2 - 24 - 6 + 12 - + + True + False + 0 + Marked for installation: + button_install_color + + + False + False + 0 + - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for installation: - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Marked for removal: + button_remove_color - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for removal: - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Marked for complete removal: + center + button_purge_color - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for complete removal: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Upgradable: + center + button_installed-outdated_color - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 2 + 3 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Upgradable: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Marked for reinstallation: + button_reinstall_color - 2 - 3 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for reinstallation: - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Marked for upgrade: + center + button_upgrade_color - 1 - 2 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + 2 + 3 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for upgrade: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Not installed: + center + button_available_color - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 5 + 6 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Not installed: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Not installed (locked): + button_available-locked_color - 5 - 6 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + 5 + 6 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Not installed (locked): - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Installed (locked): + center + button_installed-locked_color - 1 - 2 - 5 - 6 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + 4 + 5 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Installed (locked): - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Installed: + center + button_installed-updated_color - 1 - 2 - 4 - 5 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 4 + 5 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Installed: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + New in repository: + center + button_new_color - 4 - 5 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 6 + 7 + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - New in repository: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Marked for downgrade: + center + button_downgrade_color - 6 - 7 - GTK_FILL + False + False + 0 - - horizontal + + Color + True + True + False + + + False + False + end + 1 + + + + + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL + + + + + horizontal + True + False + 12 + + True False - 12 - - - True - False - 0 - Marked for downgrade: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + 0 + Broken: + center + button_broken_color - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL + False + False + 0 - - horizontal + + Color True - False - 12 - - - True - False - 0 - Broken: - center - - - False - False - 0 - - - - - Color - True - True - False - True - - - False - False - end - 1 - - + True + False - 3 - 4 - GTK_FILL - GTK_FILL + False + False + end + 1 - True - True - 0 + 3 + 4 + GTK_FILL + GTK_FILL - False - False - 1 + True + True + 0 - True - True + False + False 1 - - False - False - 1 - - - False - False - 0 - @@ -1615,12 +1367,12 @@ 12 18 - - vertical + True False - 6 - + 0 + none + True False @@ -1628,22 +1380,24 @@ <b>Temporary Files</b> True - - False - False - 0 - - - horizontal + + vertical True False + 6 + 20 - + + _Leave all downloaded packages in the cache True - False - + True + False + True + 0.5 + True + True False @@ -1652,21 +1406,53 @@ - - vertical + + _Delete downloaded packages after installation + True + True + False + True + 0.5 + True + radio_cache_leave + + + False + False + 1 + + + + + _Only delete packages which are no longer available + True + True + False + True + 0.5 + True + radio_cache_leave + + + False + False + 2 + + + + + horizontal True False - 6 - - _Leave all downloaded packages in the cache + + _Delete Cached Package Files True True False + Delete all cache package files now. True - 0.5 - True - True + False @@ -1675,98 +1461,26 @@ - - _Delete downloaded packages after installation - True - True - False - True - 0.5 - True - radio_cache_leave - - - False - False - 1 - - - - - _Only delete packages which are no longer available - True - True - False - True - 0.5 - True - radio_cache_leave - - - False - False - 2 - - - - - horizontal - True - False - - - _Delete Cached Package Files - True - True - False - Delete all cache package files now. - True - - - - False - False - 0 - - - - - - - - False - False - 3 - + False False - 1 + 3 - - False - False - 1 - - - False - False - 0 - - - vertical + True False - 6 - + 0 + none + True False @@ -1774,22 +1488,23 @@ <b>History files</b> True - - False - False - 0 - - - horizontal + + vertical True False + 6 + 20 - + + _Keep history True - False - + True + False + True + 0.5 + True False @@ -1798,20 +1513,21 @@ - - vertical + + horizontal True False 6 - - _Keep history + + Delete _History files older than: True True False True 0.5 True + radio_keep_history False @@ -1820,58 +1536,34 @@ - - horizontal + True - False - 6 - - - Delete _History files older than: - True - True - False - True - 0.5 - True - radio_keep_history - - - False - False - 0 - - - - - True - True - adjustment2 - 1 - - - True - True - 1 - - - - - True - False - days + True + adjustment2 + 1 + 5 + + + days - - False - False - 2 - + + false + True + 1 + + + + + True + False + days + False False - 1 + 2 @@ -1882,18 +1574,8 @@ - - False - False - 1 - - - True - True - 1 - @@ -1921,35 +1603,19 @@ 12 6 - - True - False - 0 - <b>Proxy Server</b> - True - - - False - False - 0 - - - - - horizontal + True False - - + 0 + none + + True False - + 0 + <b>Proxy Server</b> + True - - False - False - 0 - @@ -1993,243 +1659,219 @@ - - horizontal + True False + 3 + 3 + 12 + 6 + 20 - - True - False - - - - False - False - 0 - - - - + + horizontal True False - 3 - 3 - 12 - 6 - - - + 18 - + + True + True + IP address or host name of the http proxy server + + + + True + True + 0 + - + horizontal True False - 18 + 12 - + True - True - IP address or host name of the http proxy server - + False + 0 + Port: + spinbutton_http_port - True - True + False + False 0 - - horizontal + True - False - 12 - - - True - False - 0 - Port: - - - False - False - 0 - - - - - True - True - Port number of the http proxy server - adjustment3 - 1 - - - True - False - 1 - - + True + Port number of the http proxy server + adjustment3 + 1 - False + True False 1 - 1 - 2 + False + False + 1 + + + + + 1 + 2 + + + + + horizontal + True + False + 18 + + + True + True + IP address or host name of the ftp proxy server + + + True + True + 0 - + horizontal True False - 18 + 12 - + True - True - IP address or host name of the ftp proxy server + False + 0 + Port: + spinbutton_ftp_port - True - True + False + False 0 - - horizontal + True - False - 12 - - - True - False - 0 - Port: - - - False - False - 0 - - - - - True - True - Port number of the ftp proxy server - adjustment4 - 1 - - - True - False - 1 - - + True + Port number of the ftp proxy server + adjustment4 + 1 - False + True False 1 - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - False - 0 - No proxy for: - - - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - FTP proxy: - - - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - HTTP proxy: - - - GTK_FILL - - - - - - True - True - Comma separated list of hosts and domains that will not be contacted through the proxy (e.g. localhost, 192.168.1.231, .net) - - - 1 - 2 - 2 - 3 - - - - - - Authentication - True - True - False - True - - - - 2 - 3 - GTK_FILL - + False + False + 1 - True - True - 1 + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + False + 0 + No proxy for: + entry_no_proxy + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + FTP proxy: + entry_ftp_proxy + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + HTTP proxy: + entry_http_proxy + + + GTK_FILL + + + + + + True + True + Comma separated list of hosts and domains that will not be contacted through the proxy (e.g. localhost, 192.168.1.231, .net) + + + 1 + 2 + 2 + 3 + + + + + + Authentication + True + True + False + True + + + + 2 + 3 + GTK_FILL + @@ -2240,18 +1882,8 @@ - - True - True - 1 - - - False - False - 1 - @@ -2321,12 +1953,12 @@ - - vertical + True False - 6 - + 0 + none + True False @@ -2334,22 +1966,24 @@ <b>Package upgrade behavior (default distribution)</b> True - - False - False - 0 - - - horizontal + + vertical True False + 12 + 20 - + + Always prefer the highest version True - False - + True + False + True + 0.5 + True + False @@ -2358,31 +1992,31 @@ - - vertical + + Always prefer the installed version + True + True + False + True + 0.5 + True + radiobutton_ignore + + + + False + False + 1 + + + + + horizontal True False - 12 - - - Always prefer the highest version - True - True - False - True - 0.5 - True - - - - False - False - 0 - - - - Always prefer the installed version + + Prefer versions from: True True False @@ -2395,71 +2029,31 @@ False False - 1 + 0 - - horizontal + True False - - - Prefer versions from: - True - True - False - True - 0.5 - True - radiobutton_ignore - - - - False - False - 0 - - - - - True - False - ls_distros - - - True - True - 1 - - + ls_distros - False - False - 2 + True + True + 1 - True - True - 1 + False + False + 2 - - True - True - 1 - - - True - True - 1 - diff --git a/gtk/gtkbuilder/window_repositories.ui b/gtk/gtkbuilder/window_repositories.ui index 24fdffa8..599d52a3 100644 --- a/gtk/gtkbuilder/window_repositories.ui +++ b/gtk/gtkbuilder/window_repositories.ui @@ -114,6 +114,7 @@ False 0 URI: + entry_uri 1 @@ -129,6 +130,7 @@ False 0 Distribution: + entry_distribution 2 @@ -144,6 +146,7 @@ False 0 Section(s): + entry_sections 3 diff --git a/gtk/gtkbuilder/window_rginstall_progress_msgs.ui b/gtk/gtkbuilder/window_rginstall_progress_msgs.ui index 07fedfd5..2b46d7ab 100644 --- a/gtk/gtkbuilder/window_rginstall_progress_msgs.ui +++ b/gtk/gtkbuilder/window_rginstall_progress_msgs.ui @@ -60,13 +60,16 @@ False GTK_JUSTIFY_LEFT GTK_WRAP_WORD - False + True 3 3 0 3 3 0 + diff --git a/gtk/gtkbuilder/window_setopt.ui b/gtk/gtkbuilder/window_setopt.ui index 0fae5209..a76aa55e 100644 --- a/gtk/gtkbuilder/window_setopt.ui +++ b/gtk/gtkbuilder/window_setopt.ui @@ -205,6 +205,7 @@ -1 False 0 + entry_name 0 @@ -232,6 +233,7 @@ -1 False 0 + entry_value 0 diff --git a/gtk/rgchangelogdialog.cc b/gtk/rgchangelogdialog.cc index 08c9829d..a4212856 100644 --- a/gtk/rgchangelogdialog.cc +++ b/gtk/rgchangelogdialog.cc @@ -63,6 +63,9 @@ void ShowChangelogDialog(RGWindow *me, RPackage *pkg) gtk_text_buffer_insert_at_cursor(buffer, "\n", -1); } + // place the cursor at the start + gtk_text_buffer_place_cursor(buffer, &start); + dia.run(); // clean up diff --git a/gtk/rgdebinstallprogress.cc b/gtk/rgdebinstallprogress.cc index 9a8e2eba..96c8d7ab 100644 --- a/gtk/rgdebinstallprogress.cc +++ b/gtk/rgdebinstallprogress.cc @@ -274,6 +274,10 @@ void RGDebInstallProgress::conffile(gchar *conffile, gchar *status) gtk_style_context_add_provider(styleContext, GTK_STYLE_PROVIDER(_cssProvider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); GtkTextBuffer *text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_view)); gtk_text_buffer_set_text(text_buffer,diff.c_str(),-1); + // place the cursor at the start + GtkTextIter caret; + gtk_text_buffer_get_iter_at_offset (text_buffer, &caret, 0); + gtk_text_buffer_place_cursor(text_buffer, &caret); int res = dia.run(NULL,true); if(res == GTK_RESPONSE_YES) diff --git a/gtk/rgmainwindow.cc b/gtk/rgmainwindow.cc index 3f2d5630..f278a191 100644 --- a/gtk/rgmainwindow.cc +++ b/gtk/rgmainwindow.cc @@ -782,8 +782,12 @@ bool RGMainWindow::checkForFailedInst(vector instPkgs) "textview")); GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tv)); gtk_text_buffer_set_text(tb, utf8(failedReason.c_str()), -1); + // place the cursor at the start + GtkTextIter caret; + gtk_text_buffer_get_iter_at_offset (tb, &caret, 0); + gtk_text_buffer_place_cursor(tb, &caret); dia.run(); - // we informaed the user about the problem, we can clear the + // we informed the user about the problem, we can clear the // apt error stack // CHECKME: is this discard here really needed? _error->Discard(); @@ -848,6 +852,18 @@ RGMainWindow::RGMainWindow(RPackageLister *packLister, string name) xapianDoIndexUpdate(this); + // inject additional CSS to mask visible cursors + GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(_win)); + GtkCssProvider *css_override; + gchar *css; + css_override = gtk_css_provider_new(); + gtk_style_context_add_provider_for_screen(screen, + GTK_STYLE_PROVIDER(css_override), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + css = g_strdup_printf("textview.hidden_cursor { caret-color:rgba(0,0,0,0); }"); + gtk_css_provider_load_from_data(css_override, css, -1, NULL); + g_free(css); + // apply the proxy settings RGPreferencesWindow::applyProxySettings(); } diff --git a/gtk/rgtaskswin.cc b/gtk/rgtaskswin.cc index 7fe8e473..0cffca78 100644 --- a/gtk/rgtaskswin.cc +++ b/gtk/rgtaskswin.cc @@ -145,6 +145,11 @@ void RGTasksWin::cbButtonDetailsClicked(GtkWidget *self, void *data) "textview")); GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(tv)); gtk_text_buffer_set_text(tb, utf8(taskDescr.c_str()), -1); + + // place the cursor at the start + GtkTextIter caret; + gtk_text_buffer_get_iter_at_offset (tb, &caret, 0); + gtk_text_buffer_place_cursor(tb, &caret); dia.run(); diff --git a/gtk/rguserdialog.cc b/gtk/rguserdialog.cc index 6412086a..ee6b6436 100644 --- a/gtk/rguserdialog.cc +++ b/gtk/rguserdialog.cc @@ -92,8 +92,15 @@ bool RGUserDialog::showErrors() gtk_text_buffer_set_text(GTK_TEXT_BUFFER(buffer),utf8(msg.c_str()), -1); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD); gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview), 3); - gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE); + // We do want the cursor, for accessibility purposes. + gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), TRUE); + GtkStyleContext *ctx = gtk_widget_get_style_context(textview); + gtk_style_context_add_class(ctx, "hidden_cursor"); gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE); + // place the cursor at the start. + GtkTextIter caret; + gtk_text_buffer_get_iter_at_offset (buffer, &caret, 0); + gtk_text_buffer_place_cursor(buffer, &caret); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),