From fac76d2a4493698cc1a87d78bacd9a8fc23c7c9a Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 16:00:54 +0100 Subject: Added an extra 'Portage' tab to the preference dialog and moved all portage related options there --- doc/Changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/Changelog b/doc/Changelog index 1981cf9..31881b5 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -6,6 +6,7 @@ next: - remembers the height and width of the preference window - debug improvements - check prerequisites before starting +- reorganize preferences - bugs fixed: #44, #41, #15, #47 0.11.1: -- cgit v1.2.3-54-g00ecf From 6d2132a97778c66d0d7851723efb91226af89144 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 23:19:16 +0100 Subject: Last transition steps --- createpot.sh | 2 +- doc/Changelog | 1 + i18n/messages.pot | 508 ++++++++++++++++++++++++++++++------------------------ setup.py | 2 +- 4 files changed, 284 insertions(+), 229 deletions(-) (limited to 'doc') diff --git a/createpot.sh b/createpot.sh index ae2db3b..dae69f9 100755 --- a/createpot.sh +++ b/createpot.sh @@ -3,6 +3,6 @@ # Create the .pot file # Thanks to porthole for inspiration ;) -xgettext -k_ -kN_ -L glade -o i18n/messages.pot $(find -name "*.glade") +xgettext -k_ -kN_ -L glade -o i18n/messages.pot $(find -name "*.ui") xgettext -k_ -kN_ -j --from-code=UTF-8 -o i18n/messages.pot $(find -name "*.py") diff --git a/doc/Changelog b/doc/Changelog index 31881b5..5c7f8a7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -7,6 +7,7 @@ next: - debug improvements - check prerequisites before starting - reorganize preferences +- change from libglade to GtkBuilder - bugs fixed: #44, #41, #15, #47 0.11.1: diff --git a/i18n/messages.pot b/i18n/messages.pot index 900500c..bd57ef6 100644 --- a/i18n/messages.pot +++ b/i18n/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-17 00:14+0100\n" +"POT-Creation-Date: 2009-02-18 23:17+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,101 +16,93 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: portato/gui/templates/popups.glade:12 -#: portato/gui/templates/MainWindow.glade:192 -#: portato/gui/templates/MainWindow.glade:265 -msgid "Emerge _Paused" -msgstr "" - -#: portato/gui/templates/popups.glade:19 -#: portato/gui/templates/MainWindow.glade:200 -#: portato/gui/templates/MainWindow.glade:247 -msgid "_Kill Emerge" -msgstr "" - -#: portato/gui/templates/popups.glade:37 -#: portato/gui/templates/MainWindow.glade:70 -msgid "gtk-quit" -msgstr "" - -#: portato/gui/templates/UpdateWindow.glade:7 +#: portato/gui/templates/UpdateWindow.ui:6 msgid "Updatable Packages" msgstr "" -#: portato/gui/templates/UpdateWindow.glade:49 +#: portato/gui/templates/UpdateWindow.ui:48 msgid "_Close" msgstr "" -#: portato/gui/templates/UpdateWindow.glade:61 +#: portato/gui/templates/UpdateWindow.ui:59 msgid "Select _All" msgstr "" -#: portato/gui/templates/UpdateWindow.glade:76 +#: portato/gui/templates/UpdateWindow.ui:73 msgid "_Install Selected" msgstr "" -#: portato/gui/templates/AboutWindow.glade:8 -msgid "About Portato" -msgstr "" - -#: portato/gui/templates/PreferenceWindow.glade:7 +#: portato/gui/templates/PreferenceWindow.ui:14 msgid "Preferences" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:44 +#: portato/gui/templates/PreferenceWindow.ui:51 msgid "Debug" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:60 +#: portato/gui/templates/PreferenceWindow.ui:66 msgid "Browser command: " msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:86 -#: portato/gui/templates/PreferenceWindow.glade:602 +#: portato/gui/templates/PreferenceWindow.ui:92 +#: portato/gui/templates/PreferenceWindow.ui:652 msgid "General Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:168 +#: portato/gui/templates/PreferenceWindow.ui:125 +msgid "Used database type" +msgstr "" + +#: portato/gui/templates/PreferenceWindow.ui:146 +msgid "Database Options" +msgstr "" + +#: portato/gui/templates/PreferenceWindow.ui:168 +#: portato/gui/templates/MainWindow.ui:754 +msgid "General" +msgstr "" + +#: portato/gui/templates/PreferenceWindow.ui:245 msgid "Package sets to update" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:187 +#: portato/gui/templates/PreferenceWindow.ui:261 msgid "Update World Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:216 +#: portato/gui/templates/PreferenceWindow.ui:284 msgid "Sync command: " msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:237 +#: portato/gui/templates/PreferenceWindow.ui:305 msgid "Sync Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:290 +#: portato/gui/templates/PreferenceWindow.ui:355 msgid "File name to use, if package.use is a directory: " msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:301 +#: portato/gui/templates/PreferenceWindow.ui:366 msgid "Add only exact version to package.use" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:314 +#: portato/gui/templates/PreferenceWindow.ui:378 msgid "Add only exact version to package.keywords" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:328 +#: portato/gui/templates/PreferenceWindow.ui:391 msgid "File name to use, if package.keywords is a directory: " msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:362 +#: portato/gui/templates/PreferenceWindow.ui:425 msgid "File name to use, if package.mask/package.unmask is a directory: " msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:373 +#: portato/gui/templates/PreferenceWindow.ui:436 msgid "Add only exact version to package.mask/package.unmask" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:395 +#: portato/gui/templates/PreferenceWindow.ui:457 msgid "" "You may use the following placeholders:\n" "\n" @@ -120,381 +112,391 @@ msgid "" "$(version) : version of the package" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:422 +#: portato/gui/templates/PreferenceWindow.ui:481 msgid "Use-Flags" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:437 +#: portato/gui/templates/PreferenceWindow.ui:496 msgid "Testing Keywords" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:452 +#: portato/gui/templates/PreferenceWindow.ui:511 msgid "Masking Keywords" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:469 +#: portato/gui/templates/PreferenceWindow.ui:528 msgid "Use Flag and Keyword Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:488 -#: portato/gui/templates/MainWindow.glade:875 -msgid "General" +#: portato/gui/templates/PreferenceWindow.ui:543 +msgid "Portage" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:527 +#: portato/gui/templates/PreferenceWindow.ui:582 msgid "Enable systray" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:540 +#: portato/gui/templates/PreferenceWindow.ui:594 msgid "Show emerge progress in window title" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:554 +#: portato/gui/templates/PreferenceWindow.ui:607 msgid "Show emerge progress in console title" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:568 +#: portato/gui/templates/PreferenceWindow.ui:620 msgid "Hide on minimization (only if systray is enabled)" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:585 +#: portato/gui/templates/PreferenceWindow.ui:636 msgid "Search while typing" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:640 +#: portato/gui/templates/PreferenceWindow.ui:687 msgid "Console Font" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:651 +#: portato/gui/templates/PreferenceWindow.ui:697 msgid "Chose a console font" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:669 +#: portato/gui/templates/PreferenceWindow.ui:715 msgid "Maximum length of the console title" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:699 +#: portato/gui/templates/PreferenceWindow.ui:745 msgid "Console Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:740 +#: portato/gui/templates/PreferenceWindow.ui:783 msgid "Package Tabs" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:765 +#: portato/gui/templates/PreferenceWindow.ui:807 msgid "System Tabs" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:791 +#: portato/gui/templates/PreferenceWindow.ui:832 msgid "Tab Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:825 +#: portato/gui/templates/PreferenceWindow.ui:863 msgid "Show slots in the version list" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:837 +#: portato/gui/templates/PreferenceWindow.ui:874 msgid "Collapse categories with same prefix" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:853 +#: portato/gui/templates/PreferenceWindow.ui:889 msgid "Package Options" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:877 +#: portato/gui/templates/PreferenceWindow.ui:907 msgid "Visual" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:895 -#: portato/gui/templates/PluginWindow.glade:223 -#: portato/gui/templates/SearchWindow.glade:48 -#: portato/gui/templates/MailInfoWindow.glade:170 +#: portato/gui/templates/PreferenceWindow.ui:924 +#: portato/gui/templates/PluginWindow.ui:211 +#: portato/gui/templates/MailInfoWindow.ui:168 +#: portato/gui/templates/SearchWindow.ui:47 msgid "gtk-cancel" msgstr "" -#: portato/gui/templates/PreferenceWindow.glade:904 -#: portato/gui/templates/PluginWindow.glade:235 +#: portato/gui/templates/PreferenceWindow.ui:932 +#: portato/gui/templates/PluginWindow.ui:222 msgid "gtk-apply" msgstr "" -#: portato/gui/templates/PluginWindow.glade:8 +#: portato/gui/templates/PluginWindow.ui:7 msgid "Plugins" msgstr "" -#: portato/gui/templates/PluginWindow.glade:52 +#: portato/gui/templates/PluginWindow.ui:51 msgid "_Install dependencies" msgstr "" -#: portato/gui/templates/PluginWindow.glade:81 +#: portato/gui/templates/PluginWindow.ui:79 msgid "Needed dependencies" msgstr "" -#: portato/gui/templates/PluginWindow.glade:98 -#: portato/gui/templates/PluginWindow.glade:123 -#: portato/gui/templates/MainWindow.glade:484 -#: portato/gui/templates/MainWindow.glade:603 -#: portato/gui/templates/MainWindow.glade:716 -#: portato/gui/templates/MainWindow.glade:731 +#: portato/gui/templates/PluginWindow.ui:93 +#: portato/gui/templates/PluginWindow.ui:118 +#: portato/gui/templates/MainWindow.ui:369 +#: portato/gui/templates/MainWindow.ui:485 +#: portato/gui/templates/MainWindow.ui:598 +#: portato/gui/templates/MainWindow.ui:613 msgid "label" msgstr "" -#: portato/gui/templates/PluginWindow.glade:109 +#: portato/gui/templates/PluginWindow.ui:104 msgid "Author:" msgstr "" -#: portato/gui/templates/PluginWindow.glade:144 -#: portato/gui/windows/update.py:47 portato/gui/windows/main.py:942 -#: portato/gui/windows/plugin.py:27 +#: portato/gui/templates/PluginWindow.ui:139 portato/gui/windows/update.py:47 +#: portato/gui/windows/main.py:957 portato/gui/windows/plugin.py:27 msgid "Enabled" msgstr "" -#: portato/gui/templates/PluginWindow.glade:154 -#: portato/gui/windows/plugin.py:27 +#: portato/gui/templates/PluginWindow.ui:148 portato/gui/windows/plugin.py:27 msgid "Temporarily enabled" msgstr "" -#: portato/gui/templates/PluginWindow.glade:166 -#: portato/gui/windows/plugin.py:27 +#: portato/gui/templates/PluginWindow.ui:159 portato/gui/windows/plugin.py:27 msgid "Temporarily disabled" msgstr "" -#: portato/gui/templates/PluginWindow.glade:179 -#: portato/gui/windows/plugin.py:27 +#: portato/gui/templates/PluginWindow.ui:171 portato/gui/windows/plugin.py:27 msgid "Disabled" msgstr "" -#: portato/gui/templates/SearchWindow.glade:8 -msgid "Search Results" -msgstr "" - -#: portato/gui/templates/SearchWindow.glade:60 -msgid "gtk-jump-to" -msgstr "" - -#: portato/gui/templates/SearchWindow.glade:75 -msgid "gtk-ok" +#: portato/gui/templates/AboutWindow.ui:7 +msgid "About Portato" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:6 +#: portato/gui/templates/MailInfoWindow.ui:5 msgid "Send Bug Mail ..." msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:31 +#: portato/gui/templates/MailInfoWindow.ui:30 msgid "" "Additional Information\n" "\n" "(all optional)" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:75 +#: portato/gui/templates/MailInfoWindow.ui:74 msgid "Email address:" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:90 +#: portato/gui/templates/MailInfoWindow.ui:89 msgid "Name:" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:105 +#: portato/gui/templates/MailInfoWindow.ui:104 msgid "" "Comments /\n" "what did you do to hit the bug?" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:142 +#: portato/gui/templates/MailInfoWindow.ui:141 msgid "" "Attaches the logfile to the mail. This log only contains debug information." msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:143 +#: portato/gui/templates/MailInfoWindow.ui:142 msgid "Attach _Logfile" msgstr "" -#: portato/gui/templates/MailInfoWindow.glade:198 +#: portato/gui/templates/MailInfoWindow.ui:194 msgid "_Send" msgstr "" -#: portato/gui/templates/MainWindow.glade:20 +#: portato/gui/templates/SearchWindow.ui:7 +msgid "Search Results" +msgstr "" + +#: portato/gui/templates/SearchWindow.ui:58 +msgid "gtk-jump-to" +msgstr "" + +#: portato/gui/templates/SearchWindow.ui:72 +msgid "gtk-ok" +msgstr "" + +#: portato/gui/templates/MainWindow.ui:10 +msgid "Plu_gins" +msgstr "" + +#: portato/gui/templates/MainWindow.ui:20 msgid "_File" msgstr "" -#: portato/gui/templates/MainWindow.glade:28 +#: portato/gui/templates/MainWindow.ui:27 msgid "_Preferences" msgstr "" -#: portato/gui/templates/MainWindow.glade:46 +#: portato/gui/templates/MainWindow.ui:36 msgid "Re_load Portage" msgstr "" -#: portato/gui/templates/MainWindow.glade:83 +#: portato/gui/templates/MainWindow.ui:44 +msgid "gtk-quit" +msgstr "" + +#: portato/gui/templates/MainWindow.ui:52 msgid "_Emerge" msgstr "" -#: portato/gui/templates/MainWindow.glade:91 +#: portato/gui/templates/MainWindow.ui:59 msgid "_Install" msgstr "" -#: portato/gui/templates/MainWindow.glade:107 +#: portato/gui/templates/MainWindow.ui:68 msgid "_Uninstall" msgstr "" -#: portato/gui/templates/MainWindow.glade:123 -#: portato/gui/templates/MainWindow.glade:1082 +#: portato/gui/templates/MainWindow.ui:76 +#: portato/gui/templates/MainWindow.ui:939 msgid "Update _World" msgstr "" -#: portato/gui/templates/MainWindow.glade:132 +#: portato/gui/templates/MainWindow.ui:83 msgid "Show Updatable P_ackages" msgstr "" -#: portato/gui/templates/MainWindow.glade:141 +#: portato/gui/templates/MainWindow.ui:90 msgid "Show _Only Installed Packages" msgstr "" -#: portato/gui/templates/MainWindow.glade:155 +#: portato/gui/templates/MainWindow.ui:99 msgid "_Sync" msgstr "" -#: portato/gui/templates/MainWindow.glade:171 +#: portato/gui/templates/MainWindow.ui:108 msgid "Save _Flags" msgstr "" -#: portato/gui/templates/MainWindow.glade:223 -#: portato/gui/templates/MainWindow.glade:1192 -#: portato/gui/windows/main.py:1295 portato/gui/windows/main.py:1297 -msgid "Console" +#: portato/gui/templates/MainWindow.ui:115 +msgid "Emerge _Paused" msgstr "" -#: portato/gui/templates/MainWindow.glade:230 -msgid "_Copy" +#: portato/gui/templates/MainWindow.ui:124 +msgid "_Kill Emerge" msgstr "" -#: portato/gui/templates/MainWindow.glade:276 -msgid "Plu_gins" +#: portato/gui/templates/MainWindow.ui:133 +msgid "_Copy" msgstr "" -#: portato/gui/templates/MainWindow.glade:288 +#: portato/gui/templates/MainWindow.ui:140 msgid "_?" msgstr "" -#: portato/gui/templates/MainWindow.glade:296 +#: portato/gui/templates/MainWindow.ui:147 msgid "_About" msgstr "" -#: portato/gui/templates/MainWindow.glade:314 +#: portato/gui/templates/MainWindow.ui:155 msgid "_Plugins" msgstr "" -#: portato/gui/templates/MainWindow.glade:356 +#: portato/gui/templates/MainWindow.ui:246 msgid "gtk-delete" msgstr "" -#: portato/gui/templates/MainWindow.glade:370 +#: portato/gui/templates/MainWindow.ui:259 msgid "gtk-find" msgstr "" -#: portato/gui/templates/MainWindow.glade:495 +#: portato/gui/templates/MainWindow.ui:380 msgid "Install onto system" msgstr "" -#: portato/gui/templates/MainWindow.glade:518 +#: portato/gui/templates/MainWindow.ui:402 msgid "Uninstall from system" msgstr "" -#: portato/gui/templates/MainWindow.glade:541 +#: portato/gui/templates/MainWindow.ui:424 msgid "Revert changes" msgstr "" -#: portato/gui/templates/MainWindow.glade:619 +#: portato/gui/templates/MainWindow.ui:501 msgid "License:" msgstr "" -#: portato/gui/templates/MainWindow.glade:636 +#: portato/gui/templates/MainWindow.ui:518 msgid "Installed, but not in portage anymore" msgstr "" -#: portato/gui/templates/MainWindow.glade:651 +#: portato/gui/templates/MainWindow.ui:533 msgid "MISSING KEYWORD" msgstr "" -#: portato/gui/templates/MainWindow.glade:683 +#: portato/gui/templates/MainWindow.ui:565 msgid "Description:" msgstr "" -#: portato/gui/templates/MainWindow.glade:699 +#: portato/gui/templates/MainWindow.ui:581 msgid "Overlay:" msgstr "" -#: portato/gui/templates/MainWindow.glade:747 +#: portato/gui/templates/MainWindow.ui:629 msgid "Homepage:" msgstr "" -#: portato/gui/templates/MainWindow.glade:765 portato/gui/windows/main.py:943 +#: portato/gui/templates/MainWindow.ui:647 portato/gui/windows/main.py:958 msgid "Installed" msgstr "" -#: portato/gui/templates/MainWindow.glade:784 portato/gui/windows/main.py:258 -#: portato/gui/windows/main.py:261 portato/gui/windows/main.py:264 -#: portato/gui/windows/main.py:363 portato/gui/windows/main.py:367 -#: portato/gui/windows/main.py:374 portato/gui/windows/main.py:378 +#: portato/gui/templates/MainWindow.ui:665 portato/gui/windows/main.py:259 +#: portato/gui/windows/main.py:262 portato/gui/windows/main.py:265 +#: portato/gui/windows/main.py:364 portato/gui/windows/main.py:368 +#: portato/gui/windows/main.py:375 portato/gui/windows/main.py:379 msgid "Masked" msgstr "" -#: portato/gui/templates/MainWindow.glade:817 portato/gui/windows/main.py:275 -#: portato/gui/windows/main.py:278 portato/gui/windows/main.py:336 -#: portato/gui/windows/main.py:340 +#: portato/gui/templates/MainWindow.ui:697 portato/gui/windows/main.py:276 +#: portato/gui/windows/main.py:279 portato/gui/windows/main.py:337 +#: portato/gui/windows/main.py:341 msgid "Testing" msgstr "" -#: portato/gui/templates/MainWindow.glade:836 +#: portato/gui/templates/MainWindow.ui:715 msgid "Use Flags:" msgstr "" -#: portato/gui/templates/MainWindow.glade:901 +#: portato/gui/templates/MainWindow.ui:776 msgid "Use List" msgstr "" -#: portato/gui/templates/MainWindow.glade:928 +#: portato/gui/templates/MainWindow.ui:799 msgid "Dependencies" msgstr "" -#: portato/gui/templates/MainWindow.glade:955 +#: portato/gui/templates/MainWindow.ui:822 msgid "Ebuild" msgstr "" -#: portato/gui/templates/MainWindow.glade:982 +#: portato/gui/templates/MainWindow.ui:845 msgid "Changelog" msgstr "" -#: portato/gui/templates/MainWindow.glade:1009 +#: portato/gui/templates/MainWindow.ui:868 msgid "Files" msgstr "" -#: portato/gui/templates/MainWindow.glade:1047 +#: portato/gui/templates/MainWindow.ui:905 msgid "Execute the current selected queue" msgstr "" -#: portato/gui/templates/MainWindow.glade:1066 +#: portato/gui/templates/MainWindow.ui:923 msgid "E_xecute" msgstr "" -#: portato/gui/templates/MainWindow.glade:1081 +#: portato/gui/templates/MainWindow.ui:938 msgid "" "Calculate the packages which will be installed during an \"update world\"" msgstr "" -#: portato/gui/templates/MainWindow.glade:1094 +#: portato/gui/templates/MainWindow.ui:950 msgid "Remove the selected package from the queue" msgstr "" -#: portato/gui/templates/MainWindow.glade:1095 +#: portato/gui/templates/MainWindow.ui:951 msgid "_Remove" msgstr "" -#: portato/gui/templates/MainWindow.glade:1167 portato/gui/windows/main.py:636 +#: portato/gui/templates/MainWindow.ui:1021 portato/gui/windows/main.py:645 msgid "Queue" msgstr "" -#: portato/gui/templates/MainWindow.glade:1227 +#: portato/gui/templates/MainWindow.ui:1042 portato/gui/windows/main.py:1315 +#: portato/gui/windows/main.py:1317 +msgid "Console" +msgstr "" + +#: portato/gui/templates/MainWindow.ui:1073 msgid "Log" msgstr "" @@ -637,6 +639,11 @@ msgid "" "Please run emerge --sync && layman -S." msgstr "" +#: portato/gui/dialogs.py:123 +#, python-format +msgid "No versions of package '%s' found!" +msgstr "" + #: portato/gui/views.py:85 msgid "Package is not installed" msgstr "" @@ -651,7 +658,7 @@ msgstr "" msgid "No %(old)s language file installed. Disable highlighting." msgstr "" -#: portato/gui/views.py:130 portato/gui/windows/main.py:536 +#: portato/gui/views.py:130 portato/gui/windows/main.py:552 #, python-format msgid "Error: %s" msgstr "" @@ -723,150 +730,160 @@ msgstr "" msgid "... is starting up: %s" msgstr "" -#: portato/gui/windows/preference.py:148 +#: portato/gui/windows/preference.py:149 msgid "Top" msgstr "" -#: portato/gui/windows/preference.py:148 +#: portato/gui/windows/preference.py:149 msgid "Bottom" msgstr "" -#: portato/gui/windows/preference.py:148 +#: portato/gui/windows/preference.py:149 msgid "Left" msgstr "" -#: portato/gui/windows/preference.py:148 +#: portato/gui/windows/preference.py:149 msgid "Right" msgstr "" -#: portato/gui/windows/preference.py:206 +#: portato/gui/windows/preference.py:217 msgid "Package Set" msgstr "" -#: portato/gui/windows/preference.py:211 portato/gui/windows/main.py:945 +#: portato/gui/windows/preference.py:222 portato/gui/windows/main.py:960 msgid "Description" msgstr "" -#: portato/gui/windows/main.py:145 +#: portato/gui/windows/main.py:146 msgid "" msgstr "" -#: portato/gui/windows/main.py:171 +#: portato/gui/windows/main.py:172 msgid "The first homepage part does not start with 'http' or 'ftp'." msgstr "" -#: portato/gui/windows/main.py:175 +#: portato/gui/windows/main.py:176 msgid "Blank inside homepage." msgstr "" -#: portato/gui/windows/main.py:214 +#: portato/gui/windows/main.py:215 #, python-format msgid "Package could not be found: %s" msgstr "" -#: portato/gui/windows/main.py:267 portato/gui/windows/main.py:365 +#: portato/gui/windows/main.py:268 portato/gui/windows/main.py:366 msgid "Masked by user" msgstr "" -#: portato/gui/windows/main.py:457 +#: portato/gui/windows/main.py:462 msgid "Loading Config" msgstr "" -#: portato/gui/windows/main.py:469 +#: portato/gui/windows/main.py:474 msgid "Creating Database" msgstr "" -#: portato/gui/windows/main.py:473 +#: portato/gui/windows/main.py:478 msgid "Loading Plugins" msgstr "" -#: portato/gui/windows/main.py:486 +#: portato/gui/windows/main.py:502 msgid "Building frontend" msgstr "" -#: portato/gui/windows/main.py:577 +#: portato/gui/windows/main.py:586 msgid "Restoring Session" msgstr "" -#: portato/gui/windows/main.py:587 +#: portato/gui/windows/main.py:596 msgid "Finishing startup" msgstr "" -#: portato/gui/windows/main.py:639 +#: portato/gui/windows/main.py:648 msgid "Options" msgstr "" -#: portato/gui/windows/main.py:655 +#: portato/gui/windows/main.py:664 msgid "Categories" msgstr "" -#: portato/gui/windows/main.py:714 +#: portato/gui/windows/main.py:723 msgid "Packages" msgstr "" -#: portato/gui/windows/main.py:762 +#: portato/gui/windows/main.py:758 +#, python-format +msgid "Package '%s/%s' is disabled." +msgstr "" + +#: portato/gui/windows/main.py:775 msgid "Versions" msgstr "" -#: portato/gui/windows/main.py:765 +#: portato/gui/windows/main.py:778 msgid "Slot" msgstr "" -#: portato/gui/windows/main.py:898 +#: portato/gui/windows/main.py:913 #, python-format msgid "If '%s' is disabled" msgstr "" -#: portato/gui/windows/main.py:900 +#: portato/gui/windows/main.py:915 #, python-format msgid "If '%s' is enabled" msgstr "" -#: portato/gui/windows/main.py:906 +#: portato/gui/windows/main.py:921 msgid "One of the following" msgstr "" -#: portato/gui/windows/main.py:911 +#: portato/gui/windows/main.py:926 msgid "All of the following" msgstr "" -#: portato/gui/windows/main.py:922 +#: portato/gui/windows/main.py:937 msgid "" "Can't display dependencies: This package has an unsupported dependency " "string." msgstr "" -#: portato/gui/windows/main.py:944 +#: portato/gui/windows/main.py:959 msgid "Flag" msgstr "" -#: portato/gui/windows/main.py:968 +#: portato/gui/windows/main.py:983 msgid "This is an expanded use flag and cannot be selected" msgstr "" -#: portato/gui/windows/main.py:1006 +#: portato/gui/windows/main.py:1021 #, python-format msgid "Translating session from version %d to %d." msgstr "" -#: portato/gui/windows/main.py:1009 +#: portato/gui/windows/main.py:1024 #, python-format msgid "Cannot translate session from version %d to %d." msgstr "" -#: portato/gui/windows/main.py:1471 +#: portato/gui/windows/main.py:1364 +#, python-format +msgid "No versions of package '%s' found!." +msgstr "" + +#: portato/gui/windows/main.py:1500 msgid "use flags" msgstr "" -#: portato/gui/windows/main.py:1483 +#: portato/gui/windows/main.py:1512 msgid "masking keywords" msgstr "" -#: portato/gui/windows/main.py:1885 +#: portato/gui/windows/main.py:1886 msgid "The portage tree is not existing." msgstr "" -#: portato/gui/windows/main.py:1889 +#: portato/gui/windows/main.py:1890 msgid "The portage tree seems to be empty." msgstr "" @@ -887,30 +904,6 @@ msgstr "" msgid "Current session format is newer than this version supports." msgstr "" -#: portato/gui/utils.py:180 portato/gui/utils.py:337 -msgid "ALL" -msgstr "" - -#: portato/gui/utils.py:268 -#, python-format -msgid "" -"Catched KeyError => %s seems not to be an available category. Have you " -"played with rsync-excludes?" -msgstr "" - -#: portato/gui/utils.py:329 -#, python-format -msgid "Error while compiling search expression: '%s'." -msgstr "" - -#: portato/gui/utils.py:367 -msgid "Cleaning database..." -msgstr "" - -#: portato/gui/utils.py:369 -msgid "Populating database..." -msgstr "" - #: portato/backend/flags.py:528 #, python-format msgid "Conflicting values for masking status: %s" @@ -941,14 +934,75 @@ msgstr "" msgid "Invalid dependency string" msgstr "" -#: portato/session.py:63 +#: portato/db/__init__.py:22 +msgid "SQLite" +msgstr "" + +#: portato/db/__init__.py:22 +msgid "" +"Uses an SQLite-database to store package information.\n" +"May take longer to generate at the first time, but has advantages if portato " +"is re-started with an unchanged portage tree. Additionally it allows to use " +"fast SQL expressions for fetching the data." +msgstr "" + +#: portato/db/__init__.py:23 +msgid "Hashmap" +msgstr "" + +#: portato/db/__init__.py:23 +msgid "" +"Uses an in-memory hashmap to store package information.\n" +"Has been used since at least version 0.3.3, but all information has to be " +"regenerated on each startup." +msgstr "" + +#: portato/db/__init__.py:43 +msgid "Cannot load SQLDatabase." +msgstr "" + +#: portato/db/database.py:38 +msgid "ALL" +msgstr "" + +#: portato/db/dict.py:94 +#, python-format +msgid "" +"Catched KeyError => %s seems not to be an available category. Have you " +"played with rsync-excludes?" +msgstr "" + +#: portato/db/dict.py:149 +#, python-format +msgid "Error while compiling search expression: '%s'." +msgstr "" + +#: portato/db/sql.py:75 +msgid "Cleaning database..." +msgstr "" + +#: portato/db/sql.py:77 +msgid "Populating database..." +msgstr "" + +#: portato/session.py:67 +#, python-format +msgid "Loading '%s' session from %s." +msgstr "" + +#: portato/session.py:69 +#, python-format +msgid "Loading session from %s." +msgstr "" + +#: portato/session.py:141 #, python-format -msgid "Loading '%s' session from '%s'." +msgid "Saving '%s' session to %s." msgstr "" -#: portato/session.py:65 +#: portato/session.py:143 #, python-format -msgid "Loading session from '%s'." +msgid "Saving session to %s." msgstr "" #: portato/plistener.py:94 diff --git a/setup.py b/setup.py index 66b6373..fd1a8a8 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def plugin_list (*args): packages = ["portato", "portato.db", "portato.gui", "portato.gui.windows", "portato.plugins", "portato.backend", "portato.backend.portage"] data_files = [ - (TEMPLATE_DIR, [os.path.join("portato/gui/templates",x) for x in os.listdir("portato/gui/templates") if x.endswith(".glade")]), + (TEMPLATE_DIR, [os.path.join("portato/gui/templates",x) for x in os.listdir("portato/gui/templates") if x.endswith(".ui")]), (ICON_DIR, ["icons/portato-icon.png"]), (PLUGIN_DIR, plugin_list("gpytage", "notify", "etc_proposals", "reload_portage"))] -- cgit v1.2.3-54-g00ecf From d3f2196d3c638222a8e96c3d61626a9ff8efb2e1 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Fri, 20 Feb 2009 00:29:36 +0100 Subject: Add color btns to the preferences, so they are configurable here too --- doc/Changelog | 1 + etc/portato.cfg | 1 - portato/gui/templates/PreferenceWindow.ui | 269 ++++++++++++++++++++---------- portato/gui/windows/main.py | 16 +- portato/gui/windows/preference.py | 34 ++-- 5 files changed, 222 insertions(+), 99 deletions(-) (limited to 'doc') diff --git a/doc/Changelog b/doc/Changelog index 5c7f8a7..448c8ee 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -8,6 +8,7 @@ next: - check prerequisites before starting - reorganize preferences - change from libglade to GtkBuilder +- add color buttns to the preferences, so the colors can be changed - bugs fixed: #44, #41, #15, #47 0.11.1: diff --git a/etc/portato.cfg b/etc/portato.cfg index 5533064..950d78d 100644 --- a/etc/portato.cfg +++ b/etc/portato.cfg @@ -106,7 +106,6 @@ scrollbacklines = 1000 # # Color section -# Values in this section are normally not editable through the GUI. # [COLORS] diff --git a/portato/gui/templates/PreferenceWindow.ui b/portato/gui/templates/PreferenceWindow.ui index e5618fd..3b0edb8 100644 --- a/portato/gui/templates/PreferenceWindow.ui +++ b/portato/gui/templates/PreferenceWindow.ui @@ -56,6 +56,20 @@ 0 + + + Search while typing + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0.47999998927116394 + True + + + 1 + + True @@ -81,7 +95,7 @@ - 1 + 2 @@ -657,23 +671,6 @@ 3 - - - Search while typing - True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - Update the package list with the current search results while you are typing. -<b>Note</b>: Will slow down the typing process. - 0.47999998927116394 - True - - - 4 - - @@ -693,12 +690,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 @@ -706,35 +703,30 @@ 12 5 - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 + True - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Console Font - True + Package Tabs 0 - + True - True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Chose a console font - True - True - False 1 @@ -746,26 +738,25 @@ - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True - + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Maximum length of the console title - True + System Tabs 0 - + True - True - adjustment1 - True - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 @@ -773,7 +764,6 @@ - 4 1 @@ -782,10 +772,10 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Console Options</b> + <b>Tab Options</b> True @@ -796,12 +786,12 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 @@ -809,30 +799,97 @@ 12 5 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 5 - + + Show slots in the version list True + True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + True + + + 0 + + + + + Collapse categories with same prefix + True + True + False + True + Organize the categories in a tree. Thereby collapse categories with the same prefix: +As an example: <i>app-admin</i>, <i>app-emacs</i>, and <i>app-vim</i> would be collapsed into <i><b>app</b></i> as root and <i>admin</i>, <i>emacs</i>, and <i>vim</i> as children. + True + + + 1 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <b>Package Options</b> + True + + + + + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + 5 + 12 + 5 + + + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - Package Tabs + Console Font + True 0 - + True + True + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Chose a console font + True + True + False 1 @@ -844,25 +901,26 @@ - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - System Tabs + Maximum length of the console title + True 0 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + adjustment1 + True + True 1 @@ -870,6 +928,7 @@ + 4 1 @@ -878,26 +937,26 @@ - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Tab Options</b> + <b>Console Options</b> True False - 2 + 3 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 @@ -905,31 +964,71 @@ 12 5 - + True - - Show slots in the version list + True - True - False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True + 5 + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Package Detail Background + True + + + 0 + + + + + True + True + True + #000000000000 + + + 1 + + 0 - - Collapse categories with same prefix + True - True - False - True - Organize the categories in a tree. Thereby collapse categories with the same prefix: -As an example: <i>app-admin</i>, <i>app-emacs</i>, and <i>app-vim</i> would be collapsed into <i><b>app</b></i> as root and <i>admin</i>, <i>emacs</i>, and <i>vim</i> as children. - True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + True + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Flag Placeholder Description Background + True + + + 0 + + + + + True + True + True + #000000000000 + + + 1 + + 1 @@ -940,17 +1039,17 @@ As an example: <i>app-admin</i>, <i>app-emacs</i>, and & - + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>Package Options</b> + <b>Color Options</b> True False - 3 + 4 diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 761f6f3..ee51703 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -76,8 +76,7 @@ class PackageTable: self.maskedLabel = self.tree.get_widget("maskedLabel") # labels - generalVB = self.tree.get_widget("generalVB") - generalVB.modify_bg(gtk.STATE_NORMAL, get_color(self.main.cfg, "packagetable")) + self.main.set_color(get_color(self.main.cfg, "packagetable")) self.nameLabel = self.tree.get_widget("nameLabel") self.descLabel = self.tree.get_widget("descLabel") @@ -1259,6 +1258,17 @@ class MainWindow (Window): self.catList.get_selection().select_path(pos) self.catList.scroll_to_cell(pos) + def set_color (self, color): + """ + Sets the color of the general VB (i.e. the thing that displays the package details) + + @param color: color to set it to + @type color: gtk.gdk.Color + """ + + generalVB = self.tree.get_widget("generalVB") + generalVB.modify_bg(gtk.STATE_NORMAL, color) + def set_uri_hook (self, browser): """ Sets the browser command which is called when a URL is going to be opened. @@ -1678,7 +1688,7 @@ class MainWindow (Window): """ User wants to open preferences. """ - PreferenceWindow(self.window, self.cfg, self.console.set_font_from_string, self.set_uri_hook, self.set_notebook_tabpos, self.fill_cat_store) + PreferenceWindow(self.window, self.cfg, self.console.set_font_from_string, self.set_uri_hook, self.set_notebook_tabpos, self.fill_cat_store, self.set_color) return True def cb_about_clicked (self, *args): diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py index a7661c5..4d3493f 100644 --- a/portato/gui/windows/preference.py +++ b/portato/gui/windows/preference.py @@ -61,7 +61,7 @@ class PreferenceWindow (AbstractDialog): 4 : gtk.POS_RIGHT } - def __init__ (self, parent, cfg, console_fn, linkbtn_fn, tabpos_fn, catmodel_fn): + def __init__ (self, parent, cfg, console_fn, linkbtn_fn, tabpos_fn, catmodel_fn, labelcolor_fn): """Constructor. @param parent: parent window @@ -75,7 +75,9 @@ class PreferenceWindow (AbstractDialog): @param tabpos_fn: function to call to set the tabposition of the notebooks @type tabpos_fn: function(gtk.ComboBox,int) @param catmodel_fn: function to call to set the model of the cat list (collapsed/not collapsed) - @type catmodel_fn: function()""" + @type catmodel_fn: function() + @param labelcolor_fn: function to call to set the color of the label + @type labelcolor_fn: function(gtk.gdk.Color)""" AbstractDialog.__init__(self, parent) @@ -102,6 +104,7 @@ class PreferenceWindow (AbstractDialog): self.linkbtn_fn = linkbtn_fn self.tabpos_fn = tabpos_fn self.catmodel_fn = catmodel_fn + self.labelcolor_fn = labelcolor_fn # set the bg-color of the hint hintEB = self.tree.get_widget("hintEB") @@ -110,20 +113,16 @@ class PreferenceWindow (AbstractDialog): # the checkboxes for box, val in self.checkboxes.iteritems(): if isinstance(val, tuple): - self.tree.get_widget(box).\ - set_active(self.cfg.get_boolean(val[0], section = val[1])) + self.tree.get_widget(box).set_active(self.cfg.get_boolean(val[0], section = val[1])) else: - self.tree.get_widget(box).\ - set_active(self.cfg.get_boolean(val)) + self.tree.get_widget(box).set_active(self.cfg.get_boolean(val)) # the edits for edit, val in self.edits.iteritems(): if isinstance(val,tuple): - self.tree.get_widget(edit).\ - set_text(self.cfg.get(val[0], section = val[1])) + self.tree.get_widget(edit).set_text(self.cfg.get(val[0], section = val[1])) else: - self.tree.get_widget(edit).\ - set_text(self.cfg.get(val)) + self.tree.get_widget(edit).set_text(self.cfg.get(val)) # the set list self.setList = self.tree.get_widget("setList") @@ -139,6 +138,13 @@ class PreferenceWindow (AbstractDialog): self.titleLengthSpinBtn = self.tree.get_widget("titleLengthSpinBtn") self.titleLengthSpinBtn.set_value(int(self.cfg.get("titlelength", section = "GUI"))) + # the color buttons + self.pkgTableColorBtn = self.tree.get_widget("pkgTableColorBtn") + self.pkgTableColorBtn.set_color(get_color(self.cfg, "packagetable")) + + self.prefColorBtn = self.tree.get_widget("prefColorBtn") + self.prefColorBtn.set_color(get_color(self.cfg, "prefhint")) + # the comboboxes self.systemTabCombo = self.tree.get_widget("systemTabCombo") self.pkgTabCombo = self.tree.get_widget("packageTabCombo") @@ -209,6 +215,14 @@ class PreferenceWindow (AbstractDialog): self.catmodel_fn() + # colors + c = self.pkgTableColorBtn.get_color() + self.cfg.set("packagetable", str(c)[1:], section = "COLORS") + self.labelcolor_fn(c) + + c = self.prefColorBtn.get_color() + self.cfg.set("prefhint", str(c)[1:], section = "COLORS") + def fill_setlist (self): store = gtk.ListStore(bool, str, str, str) -- cgit v1.2.3-54-g00ecf