diff --git a/CMakeLists.txt b/CMakeLists.txt index ee54477..e73b11a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,8 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_AUTOMOC ON) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic") + set(QT_MIN_VERSION "5.12.8") set(KF_MIN_VERSION "5.68.0") diff --git a/resources/translations/cs.mo b/resources/translations/cs.mo index 4d18c64..c43fe76 100644 Binary files a/resources/translations/cs.mo and b/resources/translations/cs.mo differ diff --git a/resources/translations/cs.po b/resources/translations/cs.po index f3265bb..947d988 100644 --- a/resources/translations/cs.po +++ b/resources/translations/cs.po @@ -94,11 +94,11 @@ msgstr "Název balíčku" msgid "Package name cannot be empty" msgstr "Název balíčku nemůže být prázdný" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "Package download failure" msgstr "Selhání stahování balíčku" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "" "Package couldn't be downloaded:\n" "\n" @@ -110,23 +110,23 @@ msgstr "" "Chybové řádky:\n" "%1" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package download" msgstr "Balíček ke stažení" -#: src/downloadcommandparser.cpp:236 src/downloadcommandparser.cpp:237 +#: src/downloadcommandparser.cpp:237 src/downloadcommandparser.cpp:238 msgid "and installed" msgstr "a nainstalovány" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package %1 has been downloaded %2" msgstr "Balíček %1 byl stahován %2" -#: src/downloadcommandparser.cpp:253 +#: src/downloadcommandparser.cpp:255 msgid "Directory" msgstr "Adresář" -#: src/downloadcommandparser.cpp:254 +#: src/downloadcommandparser.cpp:256 msgid "Do you want to open directory?" msgstr "Chcete otevřít adresář?" @@ -198,7 +198,9 @@ msgstr "&Konfigurace pak-gui" #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1250 #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) -#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 +#. i18n: file: src/src/mainwindowview.ui:1274 +#. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 src/rc.cpp:456 msgid "Internet connection state and auracle-git package presence" msgstr "Stav připojení k internetu a přítomnost balíčku auracle-git" @@ -206,7 +208,9 @@ msgstr "Stav připojení k internetu a přítomnost balíčku auracle-git" #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1263 #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) -#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 +#. i18n: file: src/src/mainwindowview.ui:1287 +#. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 src/rc.cpp:462 msgid "Internet connection state and git package presence" msgstr "Stav připojení k internetu a přítomnost balíčku git" @@ -214,15 +218,21 @@ msgstr "Stav připojení k internetu a přítomnost balíčku git" #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1237 #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) -#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 +#. i18n: file: src/src/mainwindowview.ui:1261 +#. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 src/rc.cpp:450 msgid "Internet connection state" msgstr "Stav připojení k internetu" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:68 +msgid "Press \"Check\" button" +msgstr "Stiskněte tlačítko \"Zkontrolovat\"." + +#: src/mainwindowview.cpp:160 msgid "All processes ended" msgstr "Všechny procesy skončily" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:160 msgid "All processes have been completed." msgstr "Všechny procesy byly ukončeny." @@ -230,8 +240,8 @@ msgstr "Všechny procesy byly ukončeny." #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) #. i18n: file: src/src/mainwindowview.ui:543 #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) -#: src/mainwindowview.cpp:256 src/mainwindowview.cpp:413 -#: src/mainwindowview.cpp:686 src/rc.cpp:24 src/rc.cpp:210 +#: src/mainwindowview.cpp:218 src/mainwindowview.cpp:348 +#: src/mainwindowview.cpp:635 src/rc.cpp:24 src/rc.cpp:210 src/rc.cpp:408 msgid "TO UPDATE" msgstr "K AKTUALIZACI" @@ -239,32 +249,26 @@ msgstr "K AKTUALIZACI" #. i18n: ectx: property (text), widget (QLabel, accessible_packages) #. i18n: file: src/src/mainwindowview.ui:922 #. i18n: ectx: property (text), widget (QLabel, accessible_packages) -#: src/mainwindowview.cpp:257 src/mainwindowview.cpp:422 -#: src/mainwindowview.cpp:687 src/rc.cpp:45 src/rc.cpp:231 +#. i18n: file: src/src/mainwindowview.ui:946 +#. i18n: ectx: property (text), widget (QLabel, accessible_packages) +#: src/mainwindowview.cpp:219 src/mainwindowview.cpp:357 +#: src/mainwindowview.cpp:636 src/rc.cpp:45 src/rc.cpp:231 src/rc.cpp:432 msgid "AVAILABLE TO INSTALL" msgstr "K DISPOZICI PRO INSTALACI" -#: src/mainwindowview.cpp:265 src/mainwindowview.cpp:267 +#: src/mainwindowview.cpp:227 src/mainwindowview.cpp:229 msgid "No internet connection" msgstr "Žádné připojení k internetu" -#: src/mainwindowview.cpp:280 -msgid "Process abort" -msgstr "Přerušení procesu" - -#: src/mainwindowview.cpp:280 -msgid "Are you sure about quitting this process?" -msgstr "Určitě chcete tento proces ukončit?" - -#: src/mainwindowview.cpp:310 src/mainwindowview.cpp:329 +#: src/mainwindowview.cpp:250 src/mainwindowview.cpp:269 msgid "Something went wrong. Try to refresh" msgstr "Něco se pokazilo. Zkuste refresh" -#: src/mainwindowview.cpp:353 -msgid "Cannot be updated - try to refresh" -msgstr "Nelze aktualizovat - zkuste refresh" +#: src/mainwindowview.cpp:292 +msgid "Coldn't be updated" +msgstr "Nenalezena žádná aktualizace" -#: src/mainwindowview.cpp:359 +#: src/mainwindowview.cpp:298 msgid "There aren't packages to update" msgstr "Nejsou k dispozici balíčky k aktualizaci" @@ -272,8 +276,8 @@ msgstr "Nejsou k dispozici balíčky k aktualizaci" #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) #. i18n: file: src/src/mainwindowview.ui:184 #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) -#: src/mainwindowview.cpp:431 src/mainwindowview.cpp:688 src/rc.cpp:6 -#: src/rc.cpp:192 +#: src/mainwindowview.cpp:366 src/mainwindowview.cpp:637 src/rc.cpp:6 +#: src/rc.cpp:192 src/rc.cpp:390 msgid "INSTALLED" msgstr "INSTALOVANÉ" @@ -289,33 +293,40 @@ msgstr "INSTALOVANÉ" #. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) #. i18n: file: src/src/mainwindowview.ui:1093 #. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) -#: src/mainwindowview.cpp:486 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 -#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 +#. i18n: file: src/src/mainwindowview.ui:355 +#. i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +#. i18n: file: src/src/mainwindowview.ui:720 +#. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +#. i18n: file: src/src/mainwindowview.ui:1117 +#. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +#: src/mainwindowview.cpp:427 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 +#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 src/rc.cpp:396 src/rc.cpp:414 +#: src/rc.cpp:438 msgid "Input" msgstr "Vstup" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Quit" msgstr "Opustit" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "" "Application cannot be closed immediately. Try again after end of running " "operations." msgstr "" "Žádost nelze uzavřít okamžitě. Zkuste to znovu po ukončení běžících operací." -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Process running" msgstr "Spuštěný proces" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Wait until all major processes are complete" msgstr "Počkejte, dokud nebudou dokončeny všechny hlavní procesy" #. i18n: file: src/src/choicewindow.ui:40 #. i18n: ectx: property (text), widget (QLabel, choice_label) -#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 +#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 src/rc.cpp:576 msgid "Choose path for package save" msgstr "Výběr cesty pro uložení balíčku" @@ -340,7 +351,7 @@ msgstr "Aktualizace mirrors" msgid "update mirrors?" msgstr "aktualizovat mirrors?" -#: src/process.cpp:74 src/updatedpackagescolumn.cpp:152 +#: src/process.cpp:74 src/updatedpackagescolumn.cpp:168 msgid "Update all" msgstr "Aktualizace všech" @@ -388,32 +399,32 @@ msgstr "nebylo možné:" msgid "Select preview and respond to questions manually" msgstr "Vyberte náhled a odpovězte na otázky ručně" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "Uninstallation" msgstr "Odinstalace" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "remove package?" msgstr "odstranit balíček?" -#: src/process.cpp:495 +#: src/process.cpp:493 msgid "Installation" msgstr "Instalace" -#: src/process.cpp:495 src/process.cpp:496 src/process.cpp:497 -#: src/process.cpp:498 +#: src/process.cpp:493 src/process.cpp:494 src/process.cpp:495 +#: src/process.cpp:496 msgid "install package?" msgstr "nainstalovat balíček?" -#: src/process.cpp:496 +#: src/process.cpp:494 msgid "Installation from Repo" msgstr "Instalace z Repo" -#: src/process.cpp:497 +#: src/process.cpp:495 msgid "Installation from AUR" msgstr "Instalace z AUR" -#: src/process.cpp:498 +#: src/process.cpp:496 msgid "Installation from POLAUR" msgstr "Instalace z POLAUR" @@ -421,15 +432,18 @@ msgstr "Instalace z POLAUR" #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) #. i18n: file: src/src/mainwindowview.ui:768 #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) -#: src/process.cpp:499 src/rc.cpp:33 src/rc.cpp:219 src/systemtray.cpp:50 +#. i18n: file: src/src/mainwindowview.ui:792 +#. i18n: ectx: property (text), widget (QPushButton, update_packages_button) +#: src/process.cpp:497 src/rc.cpp:33 src/rc.cpp:219 src/rc.cpp:420 +#: src/systemtray.cpp:50 msgid "Update" msgstr "Update" -#: src/process.cpp:499 +#: src/process.cpp:497 msgid "update package?" msgstr "aktualizovat balíček?" -#: src/process.cpp:538 +#: src/process.cpp:536 msgid "Are you sure you want to %1" msgstr "Jste si jisti, že chcete %1" @@ -437,7 +451,7 @@ msgstr "Jste si jisti, že chcete %1" #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) #. i18n: file: src/src/mainwindowview.ui:95 #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) -#: src/rc.cpp:3 src/rc.cpp:189 +#: src/rc.cpp:3 src/rc.cpp:189 src/rc.cpp:387 msgid "View progress" msgstr "Zobrazit průběh" @@ -453,8 +467,14 @@ msgstr "Zobrazit průběh" #. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) #. i18n: file: src/src/mainwindowview.ui:967 #. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +#. i18n: file: src/src/mainwindowview.ui:229 +#. i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +#. i18n: file: src/src/mainwindowview.ui:588 +#. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +#. i18n: file: src/src/mainwindowview.ui:991 +#. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) #: src/rc.cpp:9 src/rc.cpp:27 src/rc.cpp:48 src/rc.cpp:195 src/rc.cpp:213 -#: src/rc.cpp:234 +#: src/rc.cpp:234 src/rc.cpp:393 src/rc.cpp:411 src/rc.cpp:435 msgid "Reverse sorting" msgstr "Zpětné třídění" @@ -462,7 +482,7 @@ msgstr "Zpětné třídění" #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) #. i18n: file: src/src/mainwindowview.ui:403 #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) -#: src/rc.cpp:15 src/rc.cpp:201 +#: src/rc.cpp:15 src/rc.cpp:201 src/rc.cpp:399 msgid "Uninstall" msgstr "Odinstalace" @@ -478,8 +498,14 @@ msgstr "Odinstalace" #. i18n: ectx: property (text), widget (QCheckBox, console_view_update) #. i18n: file: src/src/mainwindowview.ui:1184 #. i18n: ectx: property (text), widget (QCheckBox, console_view_install) +#. i18n: file: src/src/mainwindowview.ui:446 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +#. i18n: file: src/src/mainwindowview.ui:835 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_update) +#. i18n: file: src/src/mainwindowview.ui:1208 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_install) #: src/rc.cpp:18 src/rc.cpp:36 src/rc.cpp:57 src/rc.cpp:204 src/rc.cpp:222 -#: src/rc.cpp:243 +#: src/rc.cpp:243 src/rc.cpp:402 src/rc.cpp:423 src/rc.cpp:444 msgid "Preview" msgstr "Náhled" @@ -495,8 +521,14 @@ msgstr "Náhled" #. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) #. i18n: file: src/src/mainwindowview.ui:1198 #. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:460 +#. i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:849 +#. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +#. i18n: file: src/src/mainwindowview.ui:1222 +#. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) #: src/rc.cpp:21 src/rc.cpp:39 src/rc.cpp:60 src/rc.cpp:207 src/rc.cpp:225 -#: src/rc.cpp:246 +#: src/rc.cpp:246 src/rc.cpp:405 src/rc.cpp:426 src/rc.cpp:447 msgid "Search" msgstr "Hledat" @@ -504,7 +536,9 @@ msgstr "Hledat" #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) #. i18n: file: src/src/mainwindowview.ui:839 #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) -#: src/rc.cpp:42 src/rc.cpp:228 +#. i18n: file: src/src/mainwindowview.ui:863 +#. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +#: src/rc.cpp:42 src/rc.cpp:228 src/rc.cpp:429 msgid "Check all" msgstr "Označte všech" @@ -512,7 +546,9 @@ msgstr "Označte všech" #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) #. i18n: file: src/src/mainwindowview.ui:1141 #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) -#: src/rc.cpp:54 src/rc.cpp:240 +#. i18n: file: src/src/mainwindowview.ui:1165 +#. i18n: ectx: property (text), widget (QPushButton, install_packages_button) +#: src/rc.cpp:54 src/rc.cpp:240 src/rc.cpp:441 msgid "Install" msgstr "Instalace" @@ -520,7 +556,9 @@ msgstr "Instalace" #. i18n: ectx: property (text), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1240 #. i18n: ectx: property (text), widget (QLabel, repo_led_label) -#: src/rc.cpp:66 src/rc.cpp:252 +#. i18n: file: src/src/mainwindowview.ui:1264 +#. i18n: ectx: property (text), widget (QLabel, repo_led_label) +#: src/rc.cpp:66 src/rc.cpp:252 src/rc.cpp:453 msgid "Repositories" msgstr "Repozitáře" @@ -528,7 +566,9 @@ msgstr "Repozitáře" #. i18n: ectx: property (text), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1253 #. i18n: ectx: property (text), widget (QLabel, aur_led_label) -#: src/rc.cpp:72 src/rc.cpp:258 +#. i18n: file: src/src/mainwindowview.ui:1277 +#. i18n: ectx: property (text), widget (QLabel, aur_led_label) +#: src/rc.cpp:72 src/rc.cpp:258 src/rc.cpp:459 msgid "AUR" msgstr "AUR" @@ -536,7 +576,9 @@ msgstr "AUR" #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1266 #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) -#: src/rc.cpp:78 src/rc.cpp:264 +#. i18n: file: src/src/mainwindowview.ui:1290 +#. i18n: ectx: property (text), widget (QLabel, polaur_led_label) +#: src/rc.cpp:78 src/rc.cpp:264 src/rc.cpp:465 msgid "POLAUR" msgstr "POLAUR" @@ -544,7 +586,7 @@ msgstr "POLAUR" #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) #. i18n: file: src/src/choicewindow.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) -#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 +#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 src/rc.cpp:573 msgid "Dialog" msgstr "Dialog" @@ -552,7 +594,7 @@ msgstr "Dialog" #. i18n: ectx: attribute (title), widget (QWidget, tab1) #. i18n: file: src/src/progressview.ui:28 #. i18n: ectx: attribute (title), widget (QWidget, tab1) -#: src/rc.cpp:84 src/rc.cpp:270 +#: src/rc.cpp:84 src/rc.cpp:270 src/rc.cpp:471 msgid "Tab 1" msgstr "Tab 1" @@ -560,7 +602,7 @@ msgstr "Tab 1" #. i18n: ectx: attribute (title), widget (QWidget, tab2) #. i18n: file: src/src/progressview.ui:57 #. i18n: ectx: attribute (title), widget (QWidget, tab2) -#: src/rc.cpp:87 src/rc.cpp:273 +#: src/rc.cpp:87 src/rc.cpp:273 src/rc.cpp:474 msgid "Tab 2" msgstr "Tab 2" @@ -582,62 +624,73 @@ msgstr "Tab 2" #. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) #. i18n: file: src/src/appstylesettings.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +#. i18n: file: src/src/previewsappearancesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +#. i18n: file: src/src/logssettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +#. i18n: file: src/src/packageinput.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +#. i18n: file: src/src/packagesinfosettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +#. i18n: file: src/src/appstylesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) #: src/rc.cpp:90 src/rc.cpp:105 src/rc.cpp:120 src/rc.cpp:135 src/rc.cpp:276 -#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 +#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 src/rc.cpp:477 +#: src/rc.cpp:492 src/rc.cpp:507 src/rc.cpp:528 src/rc.cpp:582 msgid "Form" msgstr "Formulář" #. i18n: file: src/src/previewsappearancesettings.ui:41 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:93 src/rc.cpp:279 +#: src/rc.cpp:93 src/rc.cpp:279 src/rc.cpp:480 msgid "background color " msgstr "barva pozadí " #. i18n: file: src/src/previewsappearancesettings.ui:57 #. i18n: ectx: property (text), widget (QLabel, label_2) -#: src/rc.cpp:96 src/rc.cpp:282 +#: src/rc.cpp:96 src/rc.cpp:282 src/rc.cpp:483 msgid "font color" msgstr "barva písma" #. i18n: file: src/src/previewsappearancesettings.ui:71 #. i18n: ectx: property (text), widget (QLabel, label_3) -#: src/rc.cpp:99 src/rc.cpp:285 +#: src/rc.cpp:99 src/rc.cpp:285 src/rc.cpp:486 msgid "font family" msgstr "rodina písma" #. i18n: file: src/src/previewsappearancesettings.ui:98 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: src/rc.cpp:102 src/rc.cpp:288 +#: src/rc.cpp:102 src/rc.cpp:288 src/rc.cpp:489 msgid "font size " msgstr "velikost písma " #. i18n: file: src/src/logssettings.ui:39 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) -#: src/rc.cpp:108 src/rc.cpp:294 +#: src/rc.cpp:108 src/rc.cpp:294 src/rc.cpp:495 msgid "Save logs into file" msgstr "Uložení logů do souboru" #. i18n: file: src/src/logssettings.ui:49 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:111 src/rc.cpp:297 +#: src/rc.cpp:111 src/rc.cpp:297 src/rc.cpp:498 msgid "in path" msgstr "v cestě" #. i18n: file: src/src/logssettings.ui:67 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) -#: src/rc.cpp:114 src/rc.cpp:300 +#: src/rc.cpp:114 src/rc.cpp:300 src/rc.cpp:501 msgid "show debug" msgstr "zobrazit debug" #. i18n: file: src/src/logssettings.ui:74 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) -#: src/rc.cpp:117 src/rc.cpp:303 +#: src/rc.cpp:117 src/rc.cpp:303 src/rc.cpp:504 msgid "hide information logs" msgstr "skrýt informační logy" #. i18n: file: src/src/packageinput.ui:38 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:123 src/rc.cpp:309 +#: src/rc.cpp:123 src/rc.cpp:309 src/rc.cpp:510 msgid "Enter the package name" msgstr "Zadejte název balíčku" @@ -645,7 +698,7 @@ msgstr "Zadejte název balíčku" #. i18n: ectx: Menu (Actions) #. i18n: file: src/src/pak-gui.rc:14 #. i18n: ectx: Menu (Actions) -#: src/rc.cpp:126 src/rc.cpp:315 +#: src/rc.cpp:126 src/rc.cpp:315 src/rc.cpp:516 msgid "A&ctions" msgstr "A&kce" @@ -653,7 +706,7 @@ msgstr "A&kce" #. i18n: ectx: Menu (Print) #. i18n: file: src/src/pak-gui.rc:25 #. i18n: ectx: Menu (Print) -#: src/rc.cpp:129 src/rc.cpp:318 +#: src/rc.cpp:129 src/rc.cpp:318 src/rc.cpp:519 msgid "P&rint" msgstr "Z&obrazit" @@ -661,7 +714,7 @@ msgstr "Z&obrazit" #. i18n: ectx: ToolBar (mainToolBar) #. i18n: file: src/src/pak-gui.rc:38 #. i18n: ectx: ToolBar (mainToolBar) -#: src/rc.cpp:132 src/rc.cpp:324 +#: src/rc.cpp:132 src/rc.cpp:324 src/rc.cpp:525 msgid "Main Toolbar" msgstr "Hlavní panel nástrojů" @@ -673,19 +726,24 @@ msgstr "Hlavní panel nástrojů" #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) #. i18n: file: src/src/generalsettings.ui:75 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) -#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 +#. i18n: file: src/src/generalsettings.ui:48 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +#. i18n: file: src/src/generalsettings.ui:75 +#. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 src/rc.cpp:531 +#: src/rc.cpp:540 msgid "day(s)" msgstr "den(dny)" #. i18n: file: src/src/generalsettings.ui:55 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) -#: src/rc.cpp:141 src/rc.cpp:333 +#: src/rc.cpp:141 src/rc.cpp:333 src/rc.cpp:534 msgid "Check packages ready to update every " msgstr "Kontrola balíčků připravených k aktualizaci každý " #. i18n: file: src/src/generalsettings.ui:65 #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) -#: src/rc.cpp:144 src/rc.cpp:336 +#: src/rc.cpp:144 src/rc.cpp:336 src/rc.cpp:537 msgid "Try to reconnect to the internet every " msgstr "Zkuste se k internetu připojit každý " @@ -697,89 +755,100 @@ msgstr "Zkuste se k internetu připojit každý " #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) #. i18n: file: src/src/generalsettings.ui:92 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) -#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 +#. i18n: file: src/src/generalsettings.ui:82 +#. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +#. i18n: file: src/src/generalsettings.ui:92 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 src/rc.cpp:543 +#: src/rc.cpp:546 msgid "minute(s)" msgstr "minuta(y)" #. i18n: file: src/src/generalsettings.ui:99 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) -#: src/rc.cpp:156 src/rc.cpp:348 +#: src/rc.cpp:156 src/rc.cpp:348 src/rc.cpp:549 msgid "hour(s)" msgstr "hodina(y)" #. i18n: file: src/src/generalsettings.ui:106 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_label) -#: src/rc.cpp:159 src/rc.cpp:351 +#: src/rc.cpp:159 src/rc.cpp:351 src/rc.cpp:552 msgid "Store operations history for " msgstr "Ukládání historie operací do " #. i18n: file: src/src/generalsettings.ui:116 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) -#: src/rc.cpp:162 src/rc.cpp:354 +#: src/rc.cpp:162 src/rc.cpp:354 src/rc.cpp:555 msgid "Set limit of single operations history size to " msgstr "Nastavení limitu velikosti historie jednotlivých operací na " #. i18n: file: src/src/generalsettings.ui:129 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) -#: src/rc.cpp:165 src/rc.cpp:357 +#: src/rc.cpp:165 src/rc.cpp:357 src/rc.cpp:558 msgid "MB" msgstr "MB" #. i18n: file: src/src/generalsettings.ui:156 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:168 src/rc.cpp:360 +#: src/rc.cpp:168 src/rc.cpp:360 src/rc.cpp:561 msgid "If checked, any action needs answer from user within preview" msgstr "" "Pokud je zaškrtnuto, jakákoli akce vyžaduje reakci uživatele v rámci náhledu." #. i18n: file: src/src/generalsettings.ui:159 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:171 src/rc.cpp:363 +#: src/rc.cpp:171 src/rc.cpp:363 src/rc.cpp:564 msgid "Operate on actions manually" msgstr "Ruční ovládání akcí" #. i18n: file: src/src/generalsettings.ui:166 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) -#: src/rc.cpp:174 src/rc.cpp:366 +#: src/rc.cpp:174 src/rc.cpp:366 src/rc.cpp:567 msgid "Overwrite operations history file (when full size)" msgstr "Přepsání souboru historie operací (při plné velikosti)" #. i18n: file: src/src/generalsettings.ui:173 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) -#: src/rc.cpp:177 src/rc.cpp:369 +#: src/rc.cpp:177 src/rc.cpp:369 src/rc.cpp:570 msgid "Use system tray icon" msgstr "Použití ikony na systémové liště" #. i18n: file: src/src/choicewindow.ui:533 #. i18n: ectx: property (text), widget (QLabel, no_results_label) -#: src/rc.cpp:186 src/rc.cpp:378 +#: src/rc.cpp:186 src/rc.cpp:378 src/rc.cpp:579 msgid "No results" msgstr "Žádné výsledky" #. i18n: file: src/src/progressview.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) -#: src/rc.cpp:267 +#: src/rc.cpp:267 src/rc.cpp:468 msgid "Side actions" msgstr "Vedlejší akce" #. i18n: file: src/src/pak-gui.rc:10 #. i18n: ectx: Menu (Program) -#: src/rc.cpp:312 +#: src/rc.cpp:312 src/rc.cpp:513 msgid "P&rogram" msgstr "P&rogram" #. i18n: file: src/src/pak-gui.rc:29 #. i18n: ectx: Menu (Settings) -#: src/rc.cpp:321 +#: src/rc.cpp:321 src/rc.cpp:522 msgid "S&ettings" msgstr "N&astavení" #. i18n: file: src/src/appstylesettings.ui:60 #. i18n: ectx: property (text), widget (QLabel, styles_text) -#: src/rc.cpp:384 +#: src/rc.cpp:384 src/rc.cpp:585 msgid "Application style" msgstr "Styl aplikace" +#. i18n: file: src/src/mainwindowview.ui:765 +#. i18n: ectx: property (text), widget (QPushButton, check_updates_button) +#: src/rc.cpp:417 +msgid "Check" +msgstr "Zkontrolovat" + #: src/settings.cpp:90 msgid "App style change" msgstr "Změna stylu aplikace" @@ -818,18 +887,27 @@ msgstr "balíčky k aktualizaci" msgid "package to update" msgstr "balíček pro aktualizaci" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "Single AUR/POLAUR packages" msgstr "Jednotlivé balíčky AUR/POLAUR" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "It's not possible to update single AUR/POLAUR packages" msgstr "Není možné aktualizovat jednotlivé balíčky AUR/POLAUR" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Uncheck these packages" msgstr "Zrušte zaškrtnutí těchto balíčků" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Cancel" msgstr "Zrušit" + +#~ msgid "Process abort" +#~ msgstr "Přerušení procesu" + +#~ msgid "Are you sure about quitting this process?" +#~ msgstr "Určitě chcete tento proces ukončit?" + +#~ msgid "Cannot be updated - try to refresh" +#~ msgstr "Nelze aktualizovat - zkuste refresh" diff --git a/resources/translations/de.mo b/resources/translations/de.mo index c54e0be..dd61686 100644 Binary files a/resources/translations/de.mo and b/resources/translations/de.mo differ diff --git a/resources/translations/de.po b/resources/translations/de.po index fcbbf00..157ea86 100644 --- a/resources/translations/de.po +++ b/resources/translations/de.po @@ -95,11 +95,11 @@ msgstr "Paketname" msgid "Package name cannot be empty" msgstr "Paketname kann nicht leer sein" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "Package download failure" msgstr "Paket-Download Fehlschlag" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "" "Package couldn't be downloaded:\n" "\n" @@ -111,23 +111,23 @@ msgstr "" "Fehlerzeilen:\n" "%1" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package download" msgstr "Paket-Download" -#: src/downloadcommandparser.cpp:236 src/downloadcommandparser.cpp:237 +#: src/downloadcommandparser.cpp:237 src/downloadcommandparser.cpp:238 msgid "and installed" msgstr "und installiert" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package %1 has been downloaded %2" msgstr "Paket %1 wurde downgeloaded %2" -#: src/downloadcommandparser.cpp:253 +#: src/downloadcommandparser.cpp:255 msgid "Directory" msgstr "Verzeichnis" -#: src/downloadcommandparser.cpp:254 +#: src/downloadcommandparser.cpp:256 msgid "Do you want to open directory?" msgstr "Einen Katalog öffnen?" @@ -199,7 +199,9 @@ msgstr "&pak-gui konfigurieren" #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1250 #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) -#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 +#. i18n: file: src/src/mainwindowview.ui:1274 +#. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 src/rc.cpp:456 msgid "Internet connection state and auracle-git package presence" msgstr "Status der Internetverbindung und Verfügbarkeit des auracle-git-Pakets" @@ -207,7 +209,9 @@ msgstr "Status der Internetverbindung und Verfügbarkeit des auracle-git-Pakets" #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1263 #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) -#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 +#. i18n: file: src/src/mainwindowview.ui:1287 +#. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 src/rc.cpp:462 msgid "Internet connection state and git package presence" msgstr "Status der Internetverbindung und Verfügbarkeit des git-Pakets" @@ -215,15 +219,21 @@ msgstr "Status der Internetverbindung und Verfügbarkeit des git-Pakets" #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1237 #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) -#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 +#. i18n: file: src/src/mainwindowview.ui:1261 +#. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 src/rc.cpp:450 msgid "Internet connection state" msgstr "Status der Internetverbindung" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:68 +msgid "Press \"Check\" button" +msgstr "Drücke die Taste \"Prüfen\"" + +#: src/mainwindowview.cpp:160 msgid "All processes ended" msgstr "Alle Prozesse beendet" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:160 msgid "All processes have been completed." msgstr "Alle Prozesse wurden abgeschlossen." @@ -231,8 +241,8 @@ msgstr "Alle Prozesse wurden abgeschlossen." #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) #. i18n: file: src/src/mainwindowview.ui:543 #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) -#: src/mainwindowview.cpp:256 src/mainwindowview.cpp:413 -#: src/mainwindowview.cpp:686 src/rc.cpp:24 src/rc.cpp:210 +#: src/mainwindowview.cpp:218 src/mainwindowview.cpp:348 +#: src/mainwindowview.cpp:635 src/rc.cpp:24 src/rc.cpp:210 src/rc.cpp:408 msgid "TO UPDATE" msgstr "ZUM UPDATE" @@ -240,32 +250,26 @@ msgstr "ZUM UPDATE" #. i18n: ectx: property (text), widget (QLabel, accessible_packages) #. i18n: file: src/src/mainwindowview.ui:922 #. i18n: ectx: property (text), widget (QLabel, accessible_packages) -#: src/mainwindowview.cpp:257 src/mainwindowview.cpp:422 -#: src/mainwindowview.cpp:687 src/rc.cpp:45 src/rc.cpp:231 +#. i18n: file: src/src/mainwindowview.ui:946 +#. i18n: ectx: property (text), widget (QLabel, accessible_packages) +#: src/mainwindowview.cpp:219 src/mainwindowview.cpp:357 +#: src/mainwindowview.cpp:636 src/rc.cpp:45 src/rc.cpp:231 src/rc.cpp:432 msgid "AVAILABLE TO INSTALL" msgstr "ZUR INSTALLATION VERFÜGBAR" -#: src/mainwindowview.cpp:265 src/mainwindowview.cpp:267 +#: src/mainwindowview.cpp:227 src/mainwindowview.cpp:229 msgid "No internet connection" msgstr "Keine Internetverbindung" -#: src/mainwindowview.cpp:280 -msgid "Process abort" -msgstr "Prozessabbruch" - -#: src/mainwindowview.cpp:280 -msgid "Are you sure about quitting this process?" -msgstr "Bist du sicher, dass diesen Prozess beenden willst?" - -#: src/mainwindowview.cpp:310 src/mainwindowview.cpp:329 +#: src/mainwindowview.cpp:250 src/mainwindowview.cpp:269 msgid "Something went wrong. Try to refresh" msgstr "Es ist ein Fehler aufgetreten. Versuche zu aktualisieren" -#: src/mainwindowview.cpp:353 -msgid "Cannot be updated - try to refresh" -msgstr "Kann nicht aktualisiert werden - versuche zu aktualisieren" +#: src/mainwindowview.cpp:292 +msgid "Coldn't be updated" +msgstr "Kein Update gefunden" -#: src/mainwindowview.cpp:359 +#: src/mainwindowview.cpp:298 msgid "There aren't packages to update" msgstr "Es gibt keine Pakete zu aktualisieren" @@ -273,8 +277,8 @@ msgstr "Es gibt keine Pakete zu aktualisieren" #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) #. i18n: file: src/src/mainwindowview.ui:184 #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) -#: src/mainwindowview.cpp:431 src/mainwindowview.cpp:688 src/rc.cpp:6 -#: src/rc.cpp:192 +#: src/mainwindowview.cpp:366 src/mainwindowview.cpp:637 src/rc.cpp:6 +#: src/rc.cpp:192 src/rc.cpp:390 msgid "INSTALLED" msgstr "INSTALLIERTE" @@ -290,16 +294,23 @@ msgstr "INSTALLIERTE" #. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) #. i18n: file: src/src/mainwindowview.ui:1093 #. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) -#: src/mainwindowview.cpp:486 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 -#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 +#. i18n: file: src/src/mainwindowview.ui:355 +#. i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +#. i18n: file: src/src/mainwindowview.ui:720 +#. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +#. i18n: file: src/src/mainwindowview.ui:1117 +#. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +#: src/mainwindowview.cpp:427 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 +#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 src/rc.cpp:396 src/rc.cpp:414 +#: src/rc.cpp:438 msgid "Input" msgstr "Input" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Quit" msgstr "Schließen" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "" "Application cannot be closed immediately. Try again after end of running " "operations." @@ -307,17 +318,17 @@ msgstr "" "Die Applikation kann nicht sofort geschlossen werden. Versuche es nach " "Beendigung der laufenden Operationen erneut." -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Process running" msgstr "Prozess aktiv" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Wait until all major processes are complete" msgstr "Warte, bis alle wichtigen Prozesse abgeschlossen sind" #. i18n: file: src/src/choicewindow.ui:40 #. i18n: ectx: property (text), widget (QLabel, choice_label) -#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 +#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 src/rc.cpp:576 msgid "Choose path for package save" msgstr "Wähle den Verzeichnispfad für den Paketdownload" @@ -342,7 +353,7 @@ msgstr "Update-Mirrors" msgid "update mirrors?" msgstr "update mirrors willst?" -#: src/process.cpp:74 src/updatedpackagescolumn.cpp:152 +#: src/process.cpp:74 src/updatedpackagescolumn.cpp:168 msgid "Update all" msgstr "Alles aktualisieren" @@ -390,32 +401,32 @@ msgstr "war nicht möglich:" msgid "Select preview and respond to questions manually" msgstr "Wähle den Preview aus und beantworte die Fragen manuell" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "Uninstallation" msgstr "Deinstallation" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "remove package?" msgstr "Paket löschen willst?" -#: src/process.cpp:495 +#: src/process.cpp:493 msgid "Installation" msgstr "Installation" -#: src/process.cpp:495 src/process.cpp:496 src/process.cpp:497 -#: src/process.cpp:498 +#: src/process.cpp:493 src/process.cpp:494 src/process.cpp:495 +#: src/process.cpp:496 msgid "install package?" msgstr "Paket installieren willst?" -#: src/process.cpp:496 +#: src/process.cpp:494 msgid "Installation from Repo" msgstr "Installation aus Repo" -#: src/process.cpp:497 +#: src/process.cpp:495 msgid "Installation from AUR" msgstr "Installation aus AUR" -#: src/process.cpp:498 +#: src/process.cpp:496 msgid "Installation from POLAUR" msgstr "Installation aus POLAUR" @@ -423,15 +434,18 @@ msgstr "Installation aus POLAUR" #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) #. i18n: file: src/src/mainwindowview.ui:768 #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) -#: src/process.cpp:499 src/rc.cpp:33 src/rc.cpp:219 src/systemtray.cpp:50 +#. i18n: file: src/src/mainwindowview.ui:792 +#. i18n: ectx: property (text), widget (QPushButton, update_packages_button) +#: src/process.cpp:497 src/rc.cpp:33 src/rc.cpp:219 src/rc.cpp:420 +#: src/systemtray.cpp:50 msgid "Update" msgstr "Update" -#: src/process.cpp:499 +#: src/process.cpp:497 msgid "update package?" msgstr "Paket aktualisieren willst?" -#: src/process.cpp:538 +#: src/process.cpp:536 msgid "Are you sure you want to %1" msgstr "Bist du sicher, dass du %1" @@ -439,7 +453,7 @@ msgstr "Bist du sicher, dass du %1" #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) #. i18n: file: src/src/mainwindowview.ui:95 #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) -#: src/rc.cpp:3 src/rc.cpp:189 +#: src/rc.cpp:3 src/rc.cpp:189 src/rc.cpp:387 msgid "View progress" msgstr "Fortschritt anzeigen" @@ -455,8 +469,14 @@ msgstr "Fortschritt anzeigen" #. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) #. i18n: file: src/src/mainwindowview.ui:967 #. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +#. i18n: file: src/src/mainwindowview.ui:229 +#. i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +#. i18n: file: src/src/mainwindowview.ui:588 +#. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +#. i18n: file: src/src/mainwindowview.ui:991 +#. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) #: src/rc.cpp:9 src/rc.cpp:27 src/rc.cpp:48 src/rc.cpp:195 src/rc.cpp:213 -#: src/rc.cpp:234 +#: src/rc.cpp:234 src/rc.cpp:393 src/rc.cpp:411 src/rc.cpp:435 msgid "Reverse sorting" msgstr "Rückwärtssortierung" @@ -464,7 +484,7 @@ msgstr "Rückwärtssortierung" #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) #. i18n: file: src/src/mainwindowview.ui:403 #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) -#: src/rc.cpp:15 src/rc.cpp:201 +#: src/rc.cpp:15 src/rc.cpp:201 src/rc.cpp:399 msgid "Uninstall" msgstr "Deinstallation" @@ -480,8 +500,14 @@ msgstr "Deinstallation" #. i18n: ectx: property (text), widget (QCheckBox, console_view_update) #. i18n: file: src/src/mainwindowview.ui:1184 #. i18n: ectx: property (text), widget (QCheckBox, console_view_install) +#. i18n: file: src/src/mainwindowview.ui:446 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +#. i18n: file: src/src/mainwindowview.ui:835 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_update) +#. i18n: file: src/src/mainwindowview.ui:1208 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_install) #: src/rc.cpp:18 src/rc.cpp:36 src/rc.cpp:57 src/rc.cpp:204 src/rc.cpp:222 -#: src/rc.cpp:243 +#: src/rc.cpp:243 src/rc.cpp:402 src/rc.cpp:423 src/rc.cpp:444 msgid "Preview" msgstr "Preview" @@ -497,8 +523,14 @@ msgstr "Preview" #. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) #. i18n: file: src/src/mainwindowview.ui:1198 #. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:460 +#. i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:849 +#. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +#. i18n: file: src/src/mainwindowview.ui:1222 +#. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) #: src/rc.cpp:21 src/rc.cpp:39 src/rc.cpp:60 src/rc.cpp:207 src/rc.cpp:225 -#: src/rc.cpp:246 +#: src/rc.cpp:246 src/rc.cpp:405 src/rc.cpp:426 src/rc.cpp:447 msgid "Search" msgstr "Suche" @@ -506,7 +538,9 @@ msgstr "Suche" #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) #. i18n: file: src/src/mainwindowview.ui:839 #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) -#: src/rc.cpp:42 src/rc.cpp:228 +#. i18n: file: src/src/mainwindowview.ui:863 +#. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +#: src/rc.cpp:42 src/rc.cpp:228 src/rc.cpp:429 msgid "Check all" msgstr "Alle ankreuzen" @@ -514,7 +548,9 @@ msgstr "Alle ankreuzen" #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) #. i18n: file: src/src/mainwindowview.ui:1141 #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) -#: src/rc.cpp:54 src/rc.cpp:240 +#. i18n: file: src/src/mainwindowview.ui:1165 +#. i18n: ectx: property (text), widget (QPushButton, install_packages_button) +#: src/rc.cpp:54 src/rc.cpp:240 src/rc.cpp:441 msgid "Install" msgstr "Installation" @@ -522,7 +558,9 @@ msgstr "Installation" #. i18n: ectx: property (text), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1240 #. i18n: ectx: property (text), widget (QLabel, repo_led_label) -#: src/rc.cpp:66 src/rc.cpp:252 +#. i18n: file: src/src/mainwindowview.ui:1264 +#. i18n: ectx: property (text), widget (QLabel, repo_led_label) +#: src/rc.cpp:66 src/rc.cpp:252 src/rc.cpp:453 msgid "Repositories" msgstr "Repositorien" @@ -530,7 +568,9 @@ msgstr "Repositorien" #. i18n: ectx: property (text), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1253 #. i18n: ectx: property (text), widget (QLabel, aur_led_label) -#: src/rc.cpp:72 src/rc.cpp:258 +#. i18n: file: src/src/mainwindowview.ui:1277 +#. i18n: ectx: property (text), widget (QLabel, aur_led_label) +#: src/rc.cpp:72 src/rc.cpp:258 src/rc.cpp:459 msgid "AUR" msgstr "AUR" @@ -538,7 +578,9 @@ msgstr "AUR" #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1266 #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) -#: src/rc.cpp:78 src/rc.cpp:264 +#. i18n: file: src/src/mainwindowview.ui:1290 +#. i18n: ectx: property (text), widget (QLabel, polaur_led_label) +#: src/rc.cpp:78 src/rc.cpp:264 src/rc.cpp:465 msgid "POLAUR" msgstr "POLAUR" @@ -546,7 +588,7 @@ msgstr "POLAUR" #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) #. i18n: file: src/src/choicewindow.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) -#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 +#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 src/rc.cpp:573 msgid "Dialog" msgstr "Dialog" @@ -554,7 +596,7 @@ msgstr "Dialog" #. i18n: ectx: attribute (title), widget (QWidget, tab1) #. i18n: file: src/src/progressview.ui:28 #. i18n: ectx: attribute (title), widget (QWidget, tab1) -#: src/rc.cpp:84 src/rc.cpp:270 +#: src/rc.cpp:84 src/rc.cpp:270 src/rc.cpp:471 msgid "Tab 1" msgstr "Karte 1" @@ -562,7 +604,7 @@ msgstr "Karte 1" #. i18n: ectx: attribute (title), widget (QWidget, tab2) #. i18n: file: src/src/progressview.ui:57 #. i18n: ectx: attribute (title), widget (QWidget, tab2) -#: src/rc.cpp:87 src/rc.cpp:273 +#: src/rc.cpp:87 src/rc.cpp:273 src/rc.cpp:474 msgid "Tab 2" msgstr "Karte 2" @@ -584,62 +626,73 @@ msgstr "Karte 2" #. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) #. i18n: file: src/src/appstylesettings.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +#. i18n: file: src/src/previewsappearancesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +#. i18n: file: src/src/logssettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +#. i18n: file: src/src/packageinput.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +#. i18n: file: src/src/packagesinfosettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +#. i18n: file: src/src/appstylesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) #: src/rc.cpp:90 src/rc.cpp:105 src/rc.cpp:120 src/rc.cpp:135 src/rc.cpp:276 -#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 +#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 src/rc.cpp:477 +#: src/rc.cpp:492 src/rc.cpp:507 src/rc.cpp:528 src/rc.cpp:582 msgid "Form" msgstr "Formular" #. i18n: file: src/src/previewsappearancesettings.ui:41 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:93 src/rc.cpp:279 +#: src/rc.cpp:93 src/rc.cpp:279 src/rc.cpp:480 msgid "background color " msgstr "Hintergrundfarbe" #. i18n: file: src/src/previewsappearancesettings.ui:57 #. i18n: ectx: property (text), widget (QLabel, label_2) -#: src/rc.cpp:96 src/rc.cpp:282 +#: src/rc.cpp:96 src/rc.cpp:282 src/rc.cpp:483 msgid "font color" msgstr "Schriftfarbe" #. i18n: file: src/src/previewsappearancesettings.ui:71 #. i18n: ectx: property (text), widget (QLabel, label_3) -#: src/rc.cpp:99 src/rc.cpp:285 +#: src/rc.cpp:99 src/rc.cpp:285 src/rc.cpp:486 msgid "font family" msgstr "Schriftfamilie" #. i18n: file: src/src/previewsappearancesettings.ui:98 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: src/rc.cpp:102 src/rc.cpp:288 +#: src/rc.cpp:102 src/rc.cpp:288 src/rc.cpp:489 msgid "font size " msgstr "Schriftgröße " #. i18n: file: src/src/logssettings.ui:39 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) -#: src/rc.cpp:108 src/rc.cpp:294 +#: src/rc.cpp:108 src/rc.cpp:294 src/rc.cpp:495 msgid "Save logs into file" msgstr "Logs in Datei speichern" #. i18n: file: src/src/logssettings.ui:49 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:111 src/rc.cpp:297 +#: src/rc.cpp:111 src/rc.cpp:297 src/rc.cpp:498 msgid "in path" msgstr "im Pfad" #. i18n: file: src/src/logssettings.ui:67 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) -#: src/rc.cpp:114 src/rc.cpp:300 +#: src/rc.cpp:114 src/rc.cpp:300 src/rc.cpp:501 msgid "show debug" msgstr "Debug anzeigen" #. i18n: file: src/src/logssettings.ui:74 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) -#: src/rc.cpp:117 src/rc.cpp:303 +#: src/rc.cpp:117 src/rc.cpp:303 src/rc.cpp:504 msgid "hide information logs" msgstr "Informationslogs verstecken" #. i18n: file: src/src/packageinput.ui:38 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:123 src/rc.cpp:309 +#: src/rc.cpp:123 src/rc.cpp:309 src/rc.cpp:510 msgid "Enter the package name" msgstr "Gebe den Paketnamen ein" @@ -647,7 +700,7 @@ msgstr "Gebe den Paketnamen ein" #. i18n: ectx: Menu (Actions) #. i18n: file: src/src/pak-gui.rc:14 #. i18n: ectx: Menu (Actions) -#: src/rc.cpp:126 src/rc.cpp:315 +#: src/rc.cpp:126 src/rc.cpp:315 src/rc.cpp:516 msgid "A&ctions" msgstr "A&ktionen" @@ -655,7 +708,7 @@ msgstr "A&ktionen" #. i18n: ectx: Menu (Print) #. i18n: file: src/src/pak-gui.rc:25 #. i18n: ectx: Menu (Print) -#: src/rc.cpp:129 src/rc.cpp:318 +#: src/rc.cpp:129 src/rc.cpp:318 src/rc.cpp:519 msgid "P&rint" msgstr "A&nzeigen" @@ -663,7 +716,7 @@ msgstr "A&nzeigen" #. i18n: ectx: ToolBar (mainToolBar) #. i18n: file: src/src/pak-gui.rc:38 #. i18n: ectx: ToolBar (mainToolBar) -#: src/rc.cpp:132 src/rc.cpp:324 +#: src/rc.cpp:132 src/rc.cpp:324 src/rc.cpp:525 msgid "Main Toolbar" msgstr "Haupt-Symbolleiste" @@ -675,19 +728,24 @@ msgstr "Haupt-Symbolleiste" #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) #. i18n: file: src/src/generalsettings.ui:75 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) -#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 +#. i18n: file: src/src/generalsettings.ui:48 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +#. i18n: file: src/src/generalsettings.ui:75 +#. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 src/rc.cpp:531 +#: src/rc.cpp:540 msgid "day(s)" msgstr "Tag(en)" #. i18n: file: src/src/generalsettings.ui:55 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) -#: src/rc.cpp:141 src/rc.cpp:333 +#: src/rc.cpp:141 src/rc.cpp:333 src/rc.cpp:534 msgid "Check packages ready to update every " msgstr "Prüfe Pakete, die zur Aktualisierung bereit sind, jede " #. i18n: file: src/src/generalsettings.ui:65 #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) -#: src/rc.cpp:144 src/rc.cpp:336 +#: src/rc.cpp:144 src/rc.cpp:336 src/rc.cpp:537 msgid "Try to reconnect to the internet every " msgstr "Verbinde dich neu mit dem Internet jede " @@ -699,37 +757,42 @@ msgstr "Verbinde dich neu mit dem Internet jede " #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) #. i18n: file: src/src/generalsettings.ui:92 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) -#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 +#. i18n: file: src/src/generalsettings.ui:82 +#. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +#. i18n: file: src/src/generalsettings.ui:92 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 src/rc.cpp:543 +#: src/rc.cpp:546 msgid "minute(s)" msgstr "Minute(n)" #. i18n: file: src/src/generalsettings.ui:99 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) -#: src/rc.cpp:156 src/rc.cpp:348 +#: src/rc.cpp:156 src/rc.cpp:348 src/rc.cpp:549 msgid "hour(s)" msgstr "Stunde(n)" #. i18n: file: src/src/generalsettings.ui:106 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_label) -#: src/rc.cpp:159 src/rc.cpp:351 +#: src/rc.cpp:159 src/rc.cpp:351 src/rc.cpp:552 msgid "Store operations history for " msgstr "Speichern der Aktionshistorie für " #. i18n: file: src/src/generalsettings.ui:116 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) -#: src/rc.cpp:162 src/rc.cpp:354 +#: src/rc.cpp:162 src/rc.cpp:354 src/rc.cpp:555 msgid "Set limit of single operations history size to " msgstr "Begrenzung der Größe der Historie einzelner Vorgänge auf " #. i18n: file: src/src/generalsettings.ui:129 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) -#: src/rc.cpp:165 src/rc.cpp:357 +#: src/rc.cpp:165 src/rc.cpp:357 src/rc.cpp:558 msgid "MB" msgstr "MB" #. i18n: file: src/src/generalsettings.ui:156 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:168 src/rc.cpp:360 +#: src/rc.cpp:168 src/rc.cpp:360 src/rc.cpp:561 msgid "If checked, any action needs answer from user within preview" msgstr "" "Wenn diese Option aktiviert ist, muss jede Aktion vom Benutzer innerhalb der " @@ -737,52 +800,58 @@ msgstr "" #. i18n: file: src/src/generalsettings.ui:159 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:171 src/rc.cpp:363 +#: src/rc.cpp:171 src/rc.cpp:363 src/rc.cpp:564 msgid "Operate on actions manually" msgstr "Manuelles Ausführen von Aktionen" #. i18n: file: src/src/generalsettings.ui:166 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) -#: src/rc.cpp:174 src/rc.cpp:366 +#: src/rc.cpp:174 src/rc.cpp:366 src/rc.cpp:567 msgid "Overwrite operations history file (when full size)" msgstr "Überschreiben der Verlaufsdatei der Aktionen (bei voller Größe)" #. i18n: file: src/src/generalsettings.ui:173 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) -#: src/rc.cpp:177 src/rc.cpp:369 +#: src/rc.cpp:177 src/rc.cpp:369 src/rc.cpp:570 msgid "Use system tray icon" msgstr "Tray-Symbol verwenden" #. i18n: file: src/src/choicewindow.ui:533 #. i18n: ectx: property (text), widget (QLabel, no_results_label) -#: src/rc.cpp:186 src/rc.cpp:378 +#: src/rc.cpp:186 src/rc.cpp:378 src/rc.cpp:579 msgid "No results" msgstr "Keine Ergebnisse" #. i18n: file: src/src/progressview.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) -#: src/rc.cpp:267 +#: src/rc.cpp:267 src/rc.cpp:468 msgid "Side actions" msgstr "Seitliche Aktionen" #. i18n: file: src/src/pak-gui.rc:10 #. i18n: ectx: Menu (Program) -#: src/rc.cpp:312 +#: src/rc.cpp:312 src/rc.cpp:513 msgid "P&rogram" msgstr "P&rogram" #. i18n: file: src/src/pak-gui.rc:29 #. i18n: ectx: Menu (Settings) -#: src/rc.cpp:321 +#: src/rc.cpp:321 src/rc.cpp:522 msgid "S&ettings" msgstr "E&instellungen" #. i18n: file: src/src/appstylesettings.ui:60 #. i18n: ectx: property (text), widget (QLabel, styles_text) -#: src/rc.cpp:384 +#: src/rc.cpp:384 src/rc.cpp:585 msgid "Application style" msgstr "Stil der Applikation" +#. i18n: file: src/src/mainwindowview.ui:765 +#. i18n: ectx: property (text), widget (QPushButton, check_updates_button) +#: src/rc.cpp:417 +msgid "Check" +msgstr "Prüfen" + #: src/settings.cpp:90 msgid "App style change" msgstr "Änderung des App-Stils" @@ -822,18 +891,27 @@ msgstr "Pakete zum Aktualisieren" msgid "package to update" msgstr "Paket zum Aktualisieren" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "Single AUR/POLAUR packages" msgstr "Einzelne AUR/POLAUR-Pakete" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "It's not possible to update single AUR/POLAUR packages" msgstr "Es ist nicht möglich, einzelne AUR/POLAUR-Pakete zu aktualisieren" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Uncheck these packages" msgstr "Deaktiviere die folgenden Pakete" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Cancel" msgstr "Abbrechen" + +#~ msgid "Process abort" +#~ msgstr "Prozessabbruch" + +#~ msgid "Are you sure about quitting this process?" +#~ msgstr "Bist du sicher, dass diesen Prozess beenden willst?" + +#~ msgid "Cannot be updated - try to refresh" +#~ msgstr "Kann nicht aktualisiert werden - versuche zu aktualisieren" diff --git a/resources/translations/en.mo b/resources/translations/en.mo index 9410b00..15f19f6 100644 Binary files a/resources/translations/en.mo and b/resources/translations/en.mo differ diff --git a/resources/translations/en.po b/resources/translations/en.po index 3121882..b72df49 100644 --- a/resources/translations/en.po +++ b/resources/translations/en.po @@ -94,11 +94,11 @@ msgstr "Package Name" msgid "Package name cannot be empty" msgstr "Package name cannot be empty" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "Package download failure" msgstr "Package download failure" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "" "Package couldn't be downloaded:\n" "\n" @@ -110,23 +110,23 @@ msgstr "" "Error lines:\n" "%1" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package download" msgstr "Package download" -#: src/downloadcommandparser.cpp:236 src/downloadcommandparser.cpp:237 +#: src/downloadcommandparser.cpp:237 src/downloadcommandparser.cpp:238 msgid "and installed" msgstr "and installed" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package %1 has been downloaded %2" msgstr "Package %1 has been downloaded %2" -#: src/downloadcommandparser.cpp:253 +#: src/downloadcommandparser.cpp:255 msgid "Directory" msgstr "Directory" -#: src/downloadcommandparser.cpp:254 +#: src/downloadcommandparser.cpp:256 msgid "Do you want to open directory?" msgstr "Do you want to open directory?" @@ -203,7 +203,9 @@ msgstr "&Configure pak-gui" #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1250 #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) -#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 +#. i18n: file: src/src/mainwindowview.ui:1274 +#. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 src/rc.cpp:456 msgid "Internet connection state and auracle-git package presence" msgstr "Internet connection state and auracle-git package presence" @@ -211,7 +213,9 @@ msgstr "Internet connection state and auracle-git package presence" #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1263 #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) -#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 +#. i18n: file: src/src/mainwindowview.ui:1287 +#. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 src/rc.cpp:462 msgid "Internet connection state and git package presence" msgstr "Internet connection state and git package presence" @@ -219,15 +223,21 @@ msgstr "Internet connection state and git package presence" #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1237 #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) -#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 +#. i18n: file: src/src/mainwindowview.ui:1261 +#. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 src/rc.cpp:450 msgid "Internet connection state" msgstr "Internet connection state" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:68 +msgid "Press \"Check\" button" +msgstr "Press \"Check\" button" + +#: src/mainwindowview.cpp:160 msgid "All processes ended" msgstr "All processes ended" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:160 msgid "All processes have been completed." msgstr "All processes have been completed." @@ -235,8 +245,8 @@ msgstr "All processes have been completed." #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) #. i18n: file: src/src/mainwindowview.ui:543 #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) -#: src/mainwindowview.cpp:256 src/mainwindowview.cpp:413 -#: src/mainwindowview.cpp:686 src/rc.cpp:24 src/rc.cpp:210 +#: src/mainwindowview.cpp:218 src/mainwindowview.cpp:348 +#: src/mainwindowview.cpp:635 src/rc.cpp:24 src/rc.cpp:210 src/rc.cpp:408 msgid "TO UPDATE" msgstr "TO UPDATE" @@ -244,32 +254,26 @@ msgstr "TO UPDATE" #. i18n: ectx: property (text), widget (QLabel, accessible_packages) #. i18n: file: src/src/mainwindowview.ui:922 #. i18n: ectx: property (text), widget (QLabel, accessible_packages) -#: src/mainwindowview.cpp:257 src/mainwindowview.cpp:422 -#: src/mainwindowview.cpp:687 src/rc.cpp:45 src/rc.cpp:231 +#. i18n: file: src/src/mainwindowview.ui:946 +#. i18n: ectx: property (text), widget (QLabel, accessible_packages) +#: src/mainwindowview.cpp:219 src/mainwindowview.cpp:357 +#: src/mainwindowview.cpp:636 src/rc.cpp:45 src/rc.cpp:231 src/rc.cpp:432 msgid "AVAILABLE TO INSTALL" msgstr "AVAILABLE TO INSTALL" -#: src/mainwindowview.cpp:265 src/mainwindowview.cpp:267 +#: src/mainwindowview.cpp:227 src/mainwindowview.cpp:229 msgid "No internet connection" msgstr "No internet connection" -#: src/mainwindowview.cpp:280 -msgid "Process abort" -msgstr "Process abort" - -#: src/mainwindowview.cpp:280 -msgid "Are you sure about quitting this process?" -msgstr "Are you sure about quitting this process?" - -#: src/mainwindowview.cpp:310 src/mainwindowview.cpp:329 +#: src/mainwindowview.cpp:250 src/mainwindowview.cpp:269 msgid "Something went wrong. Try to refresh" msgstr "Something went wrong. Try to refresh" -#: src/mainwindowview.cpp:353 -msgid "Cannot be updated - try to refresh" -msgstr "Cannot be updated - try to refresh" +#: src/mainwindowview.cpp:292 +msgid "Coldn't be updated" +msgstr "Coldn't be updated" -#: src/mainwindowview.cpp:359 +#: src/mainwindowview.cpp:298 msgid "There aren't packages to update" msgstr "There aren't packages to update" @@ -277,8 +281,8 @@ msgstr "There aren't packages to update" #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) #. i18n: file: src/src/mainwindowview.ui:184 #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) -#: src/mainwindowview.cpp:431 src/mainwindowview.cpp:688 src/rc.cpp:6 -#: src/rc.cpp:192 +#: src/mainwindowview.cpp:366 src/mainwindowview.cpp:637 src/rc.cpp:6 +#: src/rc.cpp:192 src/rc.cpp:390 msgid "INSTALLED" msgstr "INSTALLED" @@ -294,16 +298,23 @@ msgstr "INSTALLED" #. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) #. i18n: file: src/src/mainwindowview.ui:1093 #. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) -#: src/mainwindowview.cpp:486 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 -#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 +#. i18n: file: src/src/mainwindowview.ui:355 +#. i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +#. i18n: file: src/src/mainwindowview.ui:720 +#. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +#. i18n: file: src/src/mainwindowview.ui:1117 +#. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +#: src/mainwindowview.cpp:427 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 +#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 src/rc.cpp:396 src/rc.cpp:414 +#: src/rc.cpp:438 msgid "Input" msgstr "Input" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Quit" msgstr "Quit" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "" "Application cannot be closed immediately. Try again after end of running " "operations." @@ -311,17 +322,17 @@ msgstr "" "Application cannot be closed immediately. Try again after end of running " "operations." -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Process running" msgstr "Process running" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Wait until all major processes are complete" msgstr "Wait until all major processes are complete" #. i18n: file: src/src/choicewindow.ui:40 #. i18n: ectx: property (text), widget (QLabel, choice_label) -#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 +#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 src/rc.cpp:576 msgid "Choose path for package save" msgstr "Choose path for package save" @@ -346,7 +357,7 @@ msgstr "Update mirrors" msgid "update mirrors?" msgstr "update mirrors?" -#: src/process.cpp:74 src/updatedpackagescolumn.cpp:152 +#: src/process.cpp:74 src/updatedpackagescolumn.cpp:168 msgid "Update all" msgstr "Update all" @@ -394,32 +405,32 @@ msgstr "wasn't possible:" msgid "Select preview and respond to questions manually" msgstr "Select preview and respond to questions manually" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "Uninstallation" msgstr "Uninstallation" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "remove package?" msgstr "remove package?" -#: src/process.cpp:495 +#: src/process.cpp:493 msgid "Installation" msgstr "Installation" -#: src/process.cpp:495 src/process.cpp:496 src/process.cpp:497 -#: src/process.cpp:498 +#: src/process.cpp:493 src/process.cpp:494 src/process.cpp:495 +#: src/process.cpp:496 msgid "install package?" msgstr "install package?" -#: src/process.cpp:496 +#: src/process.cpp:494 msgid "Installation from Repo" msgstr "Installation from Repo" -#: src/process.cpp:497 +#: src/process.cpp:495 msgid "Installation from AUR" msgstr "Installation from AUR" -#: src/process.cpp:498 +#: src/process.cpp:496 msgid "Installation from POLAUR" msgstr "Installation from POLAUR" @@ -427,15 +438,18 @@ msgstr "Installation from POLAUR" #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) #. i18n: file: src/src/mainwindowview.ui:768 #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) -#: src/process.cpp:499 src/rc.cpp:33 src/rc.cpp:219 src/systemtray.cpp:50 +#. i18n: file: src/src/mainwindowview.ui:792 +#. i18n: ectx: property (text), widget (QPushButton, update_packages_button) +#: src/process.cpp:497 src/rc.cpp:33 src/rc.cpp:219 src/rc.cpp:420 +#: src/systemtray.cpp:50 msgid "Update" msgstr "Update" -#: src/process.cpp:499 +#: src/process.cpp:497 msgid "update package?" msgstr "update package?" -#: src/process.cpp:538 +#: src/process.cpp:536 msgid "Are you sure you want to %1" msgstr "Are you sure you want to %1" @@ -443,7 +457,7 @@ msgstr "Are you sure you want to %1" #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) #. i18n: file: src/src/mainwindowview.ui:95 #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) -#: src/rc.cpp:3 src/rc.cpp:189 +#: src/rc.cpp:3 src/rc.cpp:189 src/rc.cpp:387 msgid "View progress" msgstr "View progress" @@ -459,8 +473,14 @@ msgstr "View progress" #. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) #. i18n: file: src/src/mainwindowview.ui:967 #. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +#. i18n: file: src/src/mainwindowview.ui:229 +#. i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +#. i18n: file: src/src/mainwindowview.ui:588 +#. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +#. i18n: file: src/src/mainwindowview.ui:991 +#. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) #: src/rc.cpp:9 src/rc.cpp:27 src/rc.cpp:48 src/rc.cpp:195 src/rc.cpp:213 -#: src/rc.cpp:234 +#: src/rc.cpp:234 src/rc.cpp:393 src/rc.cpp:411 src/rc.cpp:435 msgid "Reverse sorting" msgstr "Reverse sorting" @@ -468,7 +488,7 @@ msgstr "Reverse sorting" #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) #. i18n: file: src/src/mainwindowview.ui:403 #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) -#: src/rc.cpp:15 src/rc.cpp:201 +#: src/rc.cpp:15 src/rc.cpp:201 src/rc.cpp:399 msgid "Uninstall" msgstr "Uninstall" @@ -484,8 +504,14 @@ msgstr "Uninstall" #. i18n: ectx: property (text), widget (QCheckBox, console_view_update) #. i18n: file: src/src/mainwindowview.ui:1184 #. i18n: ectx: property (text), widget (QCheckBox, console_view_install) +#. i18n: file: src/src/mainwindowview.ui:446 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +#. i18n: file: src/src/mainwindowview.ui:835 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_update) +#. i18n: file: src/src/mainwindowview.ui:1208 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_install) #: src/rc.cpp:18 src/rc.cpp:36 src/rc.cpp:57 src/rc.cpp:204 src/rc.cpp:222 -#: src/rc.cpp:243 +#: src/rc.cpp:243 src/rc.cpp:402 src/rc.cpp:423 src/rc.cpp:444 msgid "Preview" msgstr "Preview" @@ -501,8 +527,14 @@ msgstr "Preview" #. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) #. i18n: file: src/src/mainwindowview.ui:1198 #. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:460 +#. i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:849 +#. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +#. i18n: file: src/src/mainwindowview.ui:1222 +#. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) #: src/rc.cpp:21 src/rc.cpp:39 src/rc.cpp:60 src/rc.cpp:207 src/rc.cpp:225 -#: src/rc.cpp:246 +#: src/rc.cpp:246 src/rc.cpp:405 src/rc.cpp:426 src/rc.cpp:447 msgid "Search" msgstr "Search" @@ -510,7 +542,9 @@ msgstr "Search" #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) #. i18n: file: src/src/mainwindowview.ui:839 #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) -#: src/rc.cpp:42 src/rc.cpp:228 +#. i18n: file: src/src/mainwindowview.ui:863 +#. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +#: src/rc.cpp:42 src/rc.cpp:228 src/rc.cpp:429 msgid "Check all" msgstr "Check all" @@ -518,7 +552,9 @@ msgstr "Check all" #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) #. i18n: file: src/src/mainwindowview.ui:1141 #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) -#: src/rc.cpp:54 src/rc.cpp:240 +#. i18n: file: src/src/mainwindowview.ui:1165 +#. i18n: ectx: property (text), widget (QPushButton, install_packages_button) +#: src/rc.cpp:54 src/rc.cpp:240 src/rc.cpp:441 msgid "Install" msgstr "Install" @@ -526,7 +562,9 @@ msgstr "Install" #. i18n: ectx: property (text), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1240 #. i18n: ectx: property (text), widget (QLabel, repo_led_label) -#: src/rc.cpp:66 src/rc.cpp:252 +#. i18n: file: src/src/mainwindowview.ui:1264 +#. i18n: ectx: property (text), widget (QLabel, repo_led_label) +#: src/rc.cpp:66 src/rc.cpp:252 src/rc.cpp:453 msgid "Repositories" msgstr "Repositories" @@ -534,7 +572,9 @@ msgstr "Repositories" #. i18n: ectx: property (text), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1253 #. i18n: ectx: property (text), widget (QLabel, aur_led_label) -#: src/rc.cpp:72 src/rc.cpp:258 +#. i18n: file: src/src/mainwindowview.ui:1277 +#. i18n: ectx: property (text), widget (QLabel, aur_led_label) +#: src/rc.cpp:72 src/rc.cpp:258 src/rc.cpp:459 msgid "AUR" msgstr "AUR" @@ -542,7 +582,9 @@ msgstr "AUR" #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1266 #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) -#: src/rc.cpp:78 src/rc.cpp:264 +#. i18n: file: src/src/mainwindowview.ui:1290 +#. i18n: ectx: property (text), widget (QLabel, polaur_led_label) +#: src/rc.cpp:78 src/rc.cpp:264 src/rc.cpp:465 msgid "POLAUR" msgstr "POLAUR" @@ -550,7 +592,7 @@ msgstr "POLAUR" #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) #. i18n: file: src/src/choicewindow.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) -#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 +#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 src/rc.cpp:573 msgid "Dialog" msgstr "Dialog" @@ -558,7 +600,7 @@ msgstr "Dialog" #. i18n: ectx: attribute (title), widget (QWidget, tab1) #. i18n: file: src/src/progressview.ui:28 #. i18n: ectx: attribute (title), widget (QWidget, tab1) -#: src/rc.cpp:84 src/rc.cpp:270 +#: src/rc.cpp:84 src/rc.cpp:270 src/rc.cpp:471 msgid "Tab 1" msgstr "Tab 1" @@ -566,7 +608,7 @@ msgstr "Tab 1" #. i18n: ectx: attribute (title), widget (QWidget, tab2) #. i18n: file: src/src/progressview.ui:57 #. i18n: ectx: attribute (title), widget (QWidget, tab2) -#: src/rc.cpp:87 src/rc.cpp:273 +#: src/rc.cpp:87 src/rc.cpp:273 src/rc.cpp:474 msgid "Tab 2" msgstr "Tab 2" @@ -588,62 +630,73 @@ msgstr "Tab 2" #. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) #. i18n: file: src/src/appstylesettings.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +#. i18n: file: src/src/previewsappearancesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +#. i18n: file: src/src/logssettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +#. i18n: file: src/src/packageinput.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +#. i18n: file: src/src/packagesinfosettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +#. i18n: file: src/src/appstylesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) #: src/rc.cpp:90 src/rc.cpp:105 src/rc.cpp:120 src/rc.cpp:135 src/rc.cpp:276 -#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 +#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 src/rc.cpp:477 +#: src/rc.cpp:492 src/rc.cpp:507 src/rc.cpp:528 src/rc.cpp:582 msgid "Form" msgstr "Progress" #. i18n: file: src/src/previewsappearancesettings.ui:41 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:93 src/rc.cpp:279 +#: src/rc.cpp:93 src/rc.cpp:279 src/rc.cpp:480 msgid "background color " msgstr "background color " #. i18n: file: src/src/previewsappearancesettings.ui:57 #. i18n: ectx: property (text), widget (QLabel, label_2) -#: src/rc.cpp:96 src/rc.cpp:282 +#: src/rc.cpp:96 src/rc.cpp:282 src/rc.cpp:483 msgid "font color" msgstr "font color" #. i18n: file: src/src/previewsappearancesettings.ui:71 #. i18n: ectx: property (text), widget (QLabel, label_3) -#: src/rc.cpp:99 src/rc.cpp:285 +#: src/rc.cpp:99 src/rc.cpp:285 src/rc.cpp:486 msgid "font family" msgstr "font family" #. i18n: file: src/src/previewsappearancesettings.ui:98 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: src/rc.cpp:102 src/rc.cpp:288 +#: src/rc.cpp:102 src/rc.cpp:288 src/rc.cpp:489 msgid "font size " msgstr "font size " #. i18n: file: src/src/logssettings.ui:39 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) -#: src/rc.cpp:108 src/rc.cpp:294 +#: src/rc.cpp:108 src/rc.cpp:294 src/rc.cpp:495 msgid "Save logs into file" msgstr "Save logs into file" #. i18n: file: src/src/logssettings.ui:49 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:111 src/rc.cpp:297 +#: src/rc.cpp:111 src/rc.cpp:297 src/rc.cpp:498 msgid "in path" msgstr "in path" #. i18n: file: src/src/logssettings.ui:67 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) -#: src/rc.cpp:114 src/rc.cpp:300 +#: src/rc.cpp:114 src/rc.cpp:300 src/rc.cpp:501 msgid "show debug" msgstr "show debug" #. i18n: file: src/src/logssettings.ui:74 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) -#: src/rc.cpp:117 src/rc.cpp:303 +#: src/rc.cpp:117 src/rc.cpp:303 src/rc.cpp:504 msgid "hide information logs" msgstr "hide information logs" #. i18n: file: src/src/packageinput.ui:38 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:123 src/rc.cpp:309 +#: src/rc.cpp:123 src/rc.cpp:309 src/rc.cpp:510 msgid "Enter the package name" msgstr "Enter the package name" @@ -651,7 +704,7 @@ msgstr "Enter the package name" #. i18n: ectx: Menu (Actions) #. i18n: file: src/src/pak-gui.rc:14 #. i18n: ectx: Menu (Actions) -#: src/rc.cpp:126 src/rc.cpp:315 +#: src/rc.cpp:126 src/rc.cpp:315 src/rc.cpp:516 msgid "A&ctions" msgstr "A&ctions" @@ -659,7 +712,7 @@ msgstr "A&ctions" #. i18n: ectx: Menu (Print) #. i18n: file: src/src/pak-gui.rc:25 #. i18n: ectx: Menu (Print) -#: src/rc.cpp:129 src/rc.cpp:318 +#: src/rc.cpp:129 src/rc.cpp:318 src/rc.cpp:519 msgid "P&rint" msgstr "P&rint" @@ -667,7 +720,7 @@ msgstr "P&rint" #. i18n: ectx: ToolBar (mainToolBar) #. i18n: file: src/src/pak-gui.rc:38 #. i18n: ectx: ToolBar (mainToolBar) -#: src/rc.cpp:132 src/rc.cpp:324 +#: src/rc.cpp:132 src/rc.cpp:324 src/rc.cpp:525 msgid "Main Toolbar" msgstr "Main Toolbar" @@ -679,19 +732,24 @@ msgstr "Main Toolbar" #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) #. i18n: file: src/src/generalsettings.ui:75 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) -#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 +#. i18n: file: src/src/generalsettings.ui:48 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +#. i18n: file: src/src/generalsettings.ui:75 +#. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 src/rc.cpp:531 +#: src/rc.cpp:540 msgid "day(s)" msgstr "day(s)" #. i18n: file: src/src/generalsettings.ui:55 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) -#: src/rc.cpp:141 src/rc.cpp:333 +#: src/rc.cpp:141 src/rc.cpp:333 src/rc.cpp:534 msgid "Check packages ready to update every " msgstr "Check packages ready to update every " #. i18n: file: src/src/generalsettings.ui:65 #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) -#: src/rc.cpp:144 src/rc.cpp:336 +#: src/rc.cpp:144 src/rc.cpp:336 src/rc.cpp:537 msgid "Try to reconnect to the internet every " msgstr "Try to reconnect to the internet every " @@ -703,88 +761,99 @@ msgstr "Try to reconnect to the internet every " #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) #. i18n: file: src/src/generalsettings.ui:92 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) -#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 +#. i18n: file: src/src/generalsettings.ui:82 +#. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +#. i18n: file: src/src/generalsettings.ui:92 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 src/rc.cpp:543 +#: src/rc.cpp:546 msgid "minute(s)" msgstr "minute(s)" #. i18n: file: src/src/generalsettings.ui:99 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) -#: src/rc.cpp:156 src/rc.cpp:348 +#: src/rc.cpp:156 src/rc.cpp:348 src/rc.cpp:549 msgid "hour(s)" msgstr "hour(s)" #. i18n: file: src/src/generalsettings.ui:106 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_label) -#: src/rc.cpp:159 src/rc.cpp:351 +#: src/rc.cpp:159 src/rc.cpp:351 src/rc.cpp:552 msgid "Store operations history for " msgstr "Store operations history for " #. i18n: file: src/src/generalsettings.ui:116 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) -#: src/rc.cpp:162 src/rc.cpp:354 +#: src/rc.cpp:162 src/rc.cpp:354 src/rc.cpp:555 msgid "Set limit of single operations history size to " msgstr "Set limit of single operations history size to " #. i18n: file: src/src/generalsettings.ui:129 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) -#: src/rc.cpp:165 src/rc.cpp:357 +#: src/rc.cpp:165 src/rc.cpp:357 src/rc.cpp:558 msgid "MB" msgstr "MB" #. i18n: file: src/src/generalsettings.ui:156 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:168 src/rc.cpp:360 +#: src/rc.cpp:168 src/rc.cpp:360 src/rc.cpp:561 msgid "If checked, any action needs answer from user within preview" msgstr "If checked, any action needs answer from user within preview" #. i18n: file: src/src/generalsettings.ui:159 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:171 src/rc.cpp:363 +#: src/rc.cpp:171 src/rc.cpp:363 src/rc.cpp:564 msgid "Operate on actions manually" msgstr "Operate on actions manually" #. i18n: file: src/src/generalsettings.ui:166 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) -#: src/rc.cpp:174 src/rc.cpp:366 +#: src/rc.cpp:174 src/rc.cpp:366 src/rc.cpp:567 msgid "Overwrite operations history file (when full size)" msgstr "Overwrite operations history file (when full size)" #. i18n: file: src/src/generalsettings.ui:173 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) -#: src/rc.cpp:177 src/rc.cpp:369 +#: src/rc.cpp:177 src/rc.cpp:369 src/rc.cpp:570 msgid "Use system tray icon" msgstr "Use system tray icon" #. i18n: file: src/src/choicewindow.ui:533 #. i18n: ectx: property (text), widget (QLabel, no_results_label) -#: src/rc.cpp:186 src/rc.cpp:378 +#: src/rc.cpp:186 src/rc.cpp:378 src/rc.cpp:579 msgid "No results" msgstr "No results" #. i18n: file: src/src/progressview.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) -#: src/rc.cpp:267 +#: src/rc.cpp:267 src/rc.cpp:468 msgid "Side actions" msgstr "Side actions" #. i18n: file: src/src/pak-gui.rc:10 #. i18n: ectx: Menu (Program) -#: src/rc.cpp:312 +#: src/rc.cpp:312 src/rc.cpp:513 msgid "P&rogram" msgstr "P&rogram" #. i18n: file: src/src/pak-gui.rc:29 #. i18n: ectx: Menu (Settings) -#: src/rc.cpp:321 +#: src/rc.cpp:321 src/rc.cpp:522 msgid "S&ettings" msgstr "S&ettings" #. i18n: file: src/src/appstylesettings.ui:60 #. i18n: ectx: property (text), widget (QLabel, styles_text) -#: src/rc.cpp:384 +#: src/rc.cpp:384 src/rc.cpp:585 msgid "Application style" msgstr "Application style" +#. i18n: file: src/src/mainwindowview.ui:765 +#. i18n: ectx: property (text), widget (QPushButton, check_updates_button) +#: src/rc.cpp:417 +msgid "Check" +msgstr "Check" + #: src/settings.cpp:90 msgid "App style change" msgstr "App style change" @@ -822,22 +891,31 @@ msgstr "packages to update" msgid "package to update" msgstr "package to update" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "Single AUR/POLAUR packages" msgstr "Single AUR/POLAUR packages" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "It's not possible to update single AUR/POLAUR packages" msgstr "It's not possible to update single AUR/POLAUR packages" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Uncheck these packages" msgstr "Uncheck these packages" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Cancel" msgstr "Cancel" +#~ msgid "Process abort" +#~ msgstr "Process abort" + +#~ msgid "Are you sure about quitting this process?" +#~ msgstr "Are you sure about quitting this process?" + +#~ msgid "Cannot be updated - try to refresh" +#~ msgstr "Cannot be updated - try to refresh" + #~ msgid "%1 packages to update" #~ msgstr "%1 packages to update" diff --git a/resources/translations/pak-gui.pot b/resources/translations/pak-gui.pot index 59d42fd..695e145 100644 --- a/resources/translations/pak-gui.pot +++ b/resources/translations/pak-gui.pot @@ -89,11 +89,11 @@ msgstr "" msgid "Package name cannot be empty" msgstr "" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "Package download failure" msgstr "" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "" "Package couldn't be downloaded:\n" "\n" @@ -101,23 +101,23 @@ msgid "" "%1" msgstr "" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package download" msgstr "" -#: src/downloadcommandparser.cpp:236 src/downloadcommandparser.cpp:237 +#: src/downloadcommandparser.cpp:237 src/downloadcommandparser.cpp:238 msgid "and installed" msgstr "" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package %1 has been downloaded %2" msgstr "" -#: src/downloadcommandparser.cpp:253 +#: src/downloadcommandparser.cpp:255 msgid "Directory" msgstr "" -#: src/downloadcommandparser.cpp:254 +#: src/downloadcommandparser.cpp:256 msgid "Do you want to open directory?" msgstr "" @@ -189,7 +189,9 @@ msgstr "" #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1250 #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) -#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 +#. i18n: file: src/src/mainwindowview.ui:1274 +#. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 src/rc.cpp:456 msgid "Internet connection state and auracle-git package presence" msgstr "" @@ -197,7 +199,9 @@ msgstr "" #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1263 #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) -#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 +#. i18n: file: src/src/mainwindowview.ui:1287 +#. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 src/rc.cpp:462 msgid "Internet connection state and git package presence" msgstr "" @@ -205,15 +209,21 @@ msgstr "" #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1237 #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) -#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 +#. i18n: file: src/src/mainwindowview.ui:1261 +#. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 src/rc.cpp:450 msgid "Internet connection state" msgstr "" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:68 +msgid "Press \"Check\" button" +msgstr "" + +#: src/mainwindowview.cpp:160 msgid "All processes ended" msgstr "" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:160 msgid "All processes have been completed." msgstr "" @@ -221,8 +231,8 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) #. i18n: file: src/src/mainwindowview.ui:543 #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) -#: src/mainwindowview.cpp:256 src/mainwindowview.cpp:413 -#: src/mainwindowview.cpp:686 src/rc.cpp:24 src/rc.cpp:210 +#: src/mainwindowview.cpp:218 src/mainwindowview.cpp:348 +#: src/mainwindowview.cpp:635 src/rc.cpp:24 src/rc.cpp:210 src/rc.cpp:408 msgid "TO UPDATE" msgstr "" @@ -230,32 +240,26 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, accessible_packages) #. i18n: file: src/src/mainwindowview.ui:922 #. i18n: ectx: property (text), widget (QLabel, accessible_packages) -#: src/mainwindowview.cpp:257 src/mainwindowview.cpp:422 -#: src/mainwindowview.cpp:687 src/rc.cpp:45 src/rc.cpp:231 +#. i18n: file: src/src/mainwindowview.ui:946 +#. i18n: ectx: property (text), widget (QLabel, accessible_packages) +#: src/mainwindowview.cpp:219 src/mainwindowview.cpp:357 +#: src/mainwindowview.cpp:636 src/rc.cpp:45 src/rc.cpp:231 src/rc.cpp:432 msgid "AVAILABLE TO INSTALL" msgstr "" -#: src/mainwindowview.cpp:265 src/mainwindowview.cpp:267 +#: src/mainwindowview.cpp:227 src/mainwindowview.cpp:229 msgid "No internet connection" msgstr "" -#: src/mainwindowview.cpp:280 -msgid "Process abort" -msgstr "" - -#: src/mainwindowview.cpp:280 -msgid "Are you sure about quitting this process?" -msgstr "" - -#: src/mainwindowview.cpp:310 src/mainwindowview.cpp:329 +#: src/mainwindowview.cpp:250 src/mainwindowview.cpp:269 msgid "Something went wrong. Try to refresh" msgstr "" -#: src/mainwindowview.cpp:353 -msgid "Cannot be updated - try to refresh" +#: src/mainwindowview.cpp:292 +msgid "Coldn't be updated" msgstr "" -#: src/mainwindowview.cpp:359 +#: src/mainwindowview.cpp:298 msgid "There aren't packages to update" msgstr "" @@ -263,8 +267,8 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) #. i18n: file: src/src/mainwindowview.ui:184 #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) -#: src/mainwindowview.cpp:431 src/mainwindowview.cpp:688 src/rc.cpp:6 -#: src/rc.cpp:192 +#: src/mainwindowview.cpp:366 src/mainwindowview.cpp:637 src/rc.cpp:6 +#: src/rc.cpp:192 src/rc.cpp:390 msgid "INSTALLED" msgstr "" @@ -280,30 +284,37 @@ msgstr "" #. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) #. i18n: file: src/src/mainwindowview.ui:1093 #. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) -#: src/mainwindowview.cpp:486 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 -#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 +#. i18n: file: src/src/mainwindowview.ui:355 +#. i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +#. i18n: file: src/src/mainwindowview.ui:720 +#. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +#. i18n: file: src/src/mainwindowview.ui:1117 +#. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +#: src/mainwindowview.cpp:427 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 +#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 src/rc.cpp:396 src/rc.cpp:414 +#: src/rc.cpp:438 msgid "Input" msgstr "" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Quit" msgstr "" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Application cannot be closed immediately. Try again after end of running operations." msgstr "" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Process running" msgstr "" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Wait until all major processes are complete" msgstr "" #. i18n: file: src/src/choicewindow.ui:40 #. i18n: ectx: property (text), widget (QLabel, choice_label) -#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 +#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 src/rc.cpp:576 msgid "Choose path for package save" msgstr "" @@ -328,7 +339,7 @@ msgstr "" msgid "update mirrors?" msgstr "" -#: src/process.cpp:74 src/updatedpackagescolumn.cpp:152 +#: src/process.cpp:74 src/updatedpackagescolumn.cpp:168 msgid "Update all" msgstr "" @@ -376,32 +387,32 @@ msgstr "" msgid "Select preview and respond to questions manually" msgstr "" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "Uninstallation" msgstr "" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "remove package?" msgstr "" -#: src/process.cpp:495 +#: src/process.cpp:493 msgid "Installation" msgstr "" -#: src/process.cpp:495 src/process.cpp:496 src/process.cpp:497 -#: src/process.cpp:498 +#: src/process.cpp:493 src/process.cpp:494 src/process.cpp:495 +#: src/process.cpp:496 msgid "install package?" msgstr "" -#: src/process.cpp:496 +#: src/process.cpp:494 msgid "Installation from Repo" msgstr "" -#: src/process.cpp:497 +#: src/process.cpp:495 msgid "Installation from AUR" msgstr "" -#: src/process.cpp:498 +#: src/process.cpp:496 msgid "Installation from POLAUR" msgstr "" @@ -409,15 +420,18 @@ msgstr "" #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) #. i18n: file: src/src/mainwindowview.ui:768 #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) -#: src/process.cpp:499 src/rc.cpp:33 src/rc.cpp:219 src/systemtray.cpp:50 +#. i18n: file: src/src/mainwindowview.ui:792 +#. i18n: ectx: property (text), widget (QPushButton, update_packages_button) +#: src/process.cpp:497 src/rc.cpp:33 src/rc.cpp:219 src/rc.cpp:420 +#: src/systemtray.cpp:50 msgid "Update" msgstr "" -#: src/process.cpp:499 +#: src/process.cpp:497 msgid "update package?" msgstr "" -#: src/process.cpp:538 +#: src/process.cpp:536 msgid "Are you sure you want to %1" msgstr "" @@ -425,7 +439,7 @@ msgstr "" #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) #. i18n: file: src/src/mainwindowview.ui:95 #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) -#: src/rc.cpp:3 src/rc.cpp:189 +#: src/rc.cpp:3 src/rc.cpp:189 src/rc.cpp:387 msgid "View progress" msgstr "" @@ -441,8 +455,14 @@ msgstr "" #. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) #. i18n: file: src/src/mainwindowview.ui:967 #. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +#. i18n: file: src/src/mainwindowview.ui:229 +#. i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +#. i18n: file: src/src/mainwindowview.ui:588 +#. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +#. i18n: file: src/src/mainwindowview.ui:991 +#. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) #: src/rc.cpp:9 src/rc.cpp:27 src/rc.cpp:48 src/rc.cpp:195 src/rc.cpp:213 -#: src/rc.cpp:234 +#: src/rc.cpp:234 src/rc.cpp:393 src/rc.cpp:411 src/rc.cpp:435 msgid "Reverse sorting" msgstr "" @@ -450,7 +470,7 @@ msgstr "" #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) #. i18n: file: src/src/mainwindowview.ui:403 #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) -#: src/rc.cpp:15 src/rc.cpp:201 +#: src/rc.cpp:15 src/rc.cpp:201 src/rc.cpp:399 msgid "Uninstall" msgstr "" @@ -466,8 +486,14 @@ msgstr "" #. i18n: ectx: property (text), widget (QCheckBox, console_view_update) #. i18n: file: src/src/mainwindowview.ui:1184 #. i18n: ectx: property (text), widget (QCheckBox, console_view_install) +#. i18n: file: src/src/mainwindowview.ui:446 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +#. i18n: file: src/src/mainwindowview.ui:835 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_update) +#. i18n: file: src/src/mainwindowview.ui:1208 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_install) #: src/rc.cpp:18 src/rc.cpp:36 src/rc.cpp:57 src/rc.cpp:204 src/rc.cpp:222 -#: src/rc.cpp:243 +#: src/rc.cpp:243 src/rc.cpp:402 src/rc.cpp:423 src/rc.cpp:444 msgid "Preview" msgstr "" @@ -483,8 +509,14 @@ msgstr "" #. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) #. i18n: file: src/src/mainwindowview.ui:1198 #. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:460 +#. i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:849 +#. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +#. i18n: file: src/src/mainwindowview.ui:1222 +#. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) #: src/rc.cpp:21 src/rc.cpp:39 src/rc.cpp:60 src/rc.cpp:207 src/rc.cpp:225 -#: src/rc.cpp:246 +#: src/rc.cpp:246 src/rc.cpp:405 src/rc.cpp:426 src/rc.cpp:447 msgid "Search" msgstr "" @@ -492,7 +524,9 @@ msgstr "" #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) #. i18n: file: src/src/mainwindowview.ui:839 #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) -#: src/rc.cpp:42 src/rc.cpp:228 +#. i18n: file: src/src/mainwindowview.ui:863 +#. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +#: src/rc.cpp:42 src/rc.cpp:228 src/rc.cpp:429 msgid "Check all" msgstr "" @@ -500,7 +534,9 @@ msgstr "" #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) #. i18n: file: src/src/mainwindowview.ui:1141 #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) -#: src/rc.cpp:54 src/rc.cpp:240 +#. i18n: file: src/src/mainwindowview.ui:1165 +#. i18n: ectx: property (text), widget (QPushButton, install_packages_button) +#: src/rc.cpp:54 src/rc.cpp:240 src/rc.cpp:441 msgid "Install" msgstr "" @@ -508,7 +544,9 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1240 #. i18n: ectx: property (text), widget (QLabel, repo_led_label) -#: src/rc.cpp:66 src/rc.cpp:252 +#. i18n: file: src/src/mainwindowview.ui:1264 +#. i18n: ectx: property (text), widget (QLabel, repo_led_label) +#: src/rc.cpp:66 src/rc.cpp:252 src/rc.cpp:453 msgid "Repositories" msgstr "" @@ -516,7 +554,9 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1253 #. i18n: ectx: property (text), widget (QLabel, aur_led_label) -#: src/rc.cpp:72 src/rc.cpp:258 +#. i18n: file: src/src/mainwindowview.ui:1277 +#. i18n: ectx: property (text), widget (QLabel, aur_led_label) +#: src/rc.cpp:72 src/rc.cpp:258 src/rc.cpp:459 msgid "AUR" msgstr "" @@ -524,7 +564,9 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1266 #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) -#: src/rc.cpp:78 src/rc.cpp:264 +#. i18n: file: src/src/mainwindowview.ui:1290 +#. i18n: ectx: property (text), widget (QLabel, polaur_led_label) +#: src/rc.cpp:78 src/rc.cpp:264 src/rc.cpp:465 msgid "POLAUR" msgstr "" @@ -532,7 +574,7 @@ msgstr "" #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) #. i18n: file: src/src/choicewindow.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) -#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 +#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 src/rc.cpp:573 msgid "Dialog" msgstr "" @@ -540,7 +582,7 @@ msgstr "" #. i18n: ectx: attribute (title), widget (QWidget, tab1) #. i18n: file: src/src/progressview.ui:28 #. i18n: ectx: attribute (title), widget (QWidget, tab1) -#: src/rc.cpp:84 src/rc.cpp:270 +#: src/rc.cpp:84 src/rc.cpp:270 src/rc.cpp:471 msgid "Tab 1" msgstr "" @@ -548,7 +590,7 @@ msgstr "" #. i18n: ectx: attribute (title), widget (QWidget, tab2) #. i18n: file: src/src/progressview.ui:57 #. i18n: ectx: attribute (title), widget (QWidget, tab2) -#: src/rc.cpp:87 src/rc.cpp:273 +#: src/rc.cpp:87 src/rc.cpp:273 src/rc.cpp:474 msgid "Tab 2" msgstr "" @@ -570,62 +612,73 @@ msgstr "" #. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) #. i18n: file: src/src/appstylesettings.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +#. i18n: file: src/src/previewsappearancesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +#. i18n: file: src/src/logssettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +#. i18n: file: src/src/packageinput.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +#. i18n: file: src/src/packagesinfosettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +#. i18n: file: src/src/appstylesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) #: src/rc.cpp:90 src/rc.cpp:105 src/rc.cpp:120 src/rc.cpp:135 src/rc.cpp:276 -#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 +#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 src/rc.cpp:477 +#: src/rc.cpp:492 src/rc.cpp:507 src/rc.cpp:528 src/rc.cpp:582 msgid "Form" msgstr "" #. i18n: file: src/src/previewsappearancesettings.ui:41 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:93 src/rc.cpp:279 +#: src/rc.cpp:93 src/rc.cpp:279 src/rc.cpp:480 msgid "background color " msgstr "" #. i18n: file: src/src/previewsappearancesettings.ui:57 #. i18n: ectx: property (text), widget (QLabel, label_2) -#: src/rc.cpp:96 src/rc.cpp:282 +#: src/rc.cpp:96 src/rc.cpp:282 src/rc.cpp:483 msgid "font color" msgstr "" #. i18n: file: src/src/previewsappearancesettings.ui:71 #. i18n: ectx: property (text), widget (QLabel, label_3) -#: src/rc.cpp:99 src/rc.cpp:285 +#: src/rc.cpp:99 src/rc.cpp:285 src/rc.cpp:486 msgid "font family" msgstr "" #. i18n: file: src/src/previewsappearancesettings.ui:98 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: src/rc.cpp:102 src/rc.cpp:288 +#: src/rc.cpp:102 src/rc.cpp:288 src/rc.cpp:489 msgid "font size " msgstr "" #. i18n: file: src/src/logssettings.ui:39 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) -#: src/rc.cpp:108 src/rc.cpp:294 +#: src/rc.cpp:108 src/rc.cpp:294 src/rc.cpp:495 msgid "Save logs into file" msgstr "" #. i18n: file: src/src/logssettings.ui:49 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:111 src/rc.cpp:297 +#: src/rc.cpp:111 src/rc.cpp:297 src/rc.cpp:498 msgid "in path" msgstr "" #. i18n: file: src/src/logssettings.ui:67 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) -#: src/rc.cpp:114 src/rc.cpp:300 +#: src/rc.cpp:114 src/rc.cpp:300 src/rc.cpp:501 msgid "show debug" msgstr "" #. i18n: file: src/src/logssettings.ui:74 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) -#: src/rc.cpp:117 src/rc.cpp:303 +#: src/rc.cpp:117 src/rc.cpp:303 src/rc.cpp:504 msgid "hide information logs" msgstr "" #. i18n: file: src/src/packageinput.ui:38 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:123 src/rc.cpp:309 +#: src/rc.cpp:123 src/rc.cpp:309 src/rc.cpp:510 msgid "Enter the package name" msgstr "" @@ -633,7 +686,7 @@ msgstr "" #. i18n: ectx: Menu (Actions) #. i18n: file: src/src/pak-gui.rc:14 #. i18n: ectx: Menu (Actions) -#: src/rc.cpp:126 src/rc.cpp:315 +#: src/rc.cpp:126 src/rc.cpp:315 src/rc.cpp:516 msgid "A&ctions" msgstr "" @@ -641,7 +694,7 @@ msgstr "" #. i18n: ectx: Menu (Print) #. i18n: file: src/src/pak-gui.rc:25 #. i18n: ectx: Menu (Print) -#: src/rc.cpp:129 src/rc.cpp:318 +#: src/rc.cpp:129 src/rc.cpp:318 src/rc.cpp:519 msgid "P&rint" msgstr "" @@ -649,7 +702,7 @@ msgstr "" #. i18n: ectx: ToolBar (mainToolBar) #. i18n: file: src/src/pak-gui.rc:38 #. i18n: ectx: ToolBar (mainToolBar) -#: src/rc.cpp:132 src/rc.cpp:324 +#: src/rc.cpp:132 src/rc.cpp:324 src/rc.cpp:525 msgid "Main Toolbar" msgstr "" @@ -661,19 +714,24 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) #. i18n: file: src/src/generalsettings.ui:75 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) -#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 +#. i18n: file: src/src/generalsettings.ui:48 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +#. i18n: file: src/src/generalsettings.ui:75 +#. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 src/rc.cpp:531 +#: src/rc.cpp:540 msgid "day(s)" msgstr "" #. i18n: file: src/src/generalsettings.ui:55 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) -#: src/rc.cpp:141 src/rc.cpp:333 +#: src/rc.cpp:141 src/rc.cpp:333 src/rc.cpp:534 msgid "Check packages ready to update every " msgstr "" #. i18n: file: src/src/generalsettings.ui:65 #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) -#: src/rc.cpp:144 src/rc.cpp:336 +#: src/rc.cpp:144 src/rc.cpp:336 src/rc.cpp:537 msgid "Try to reconnect to the internet every " msgstr "" @@ -685,88 +743,99 @@ msgstr "" #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) #. i18n: file: src/src/generalsettings.ui:92 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) -#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 +#. i18n: file: src/src/generalsettings.ui:82 +#. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +#. i18n: file: src/src/generalsettings.ui:92 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 src/rc.cpp:543 +#: src/rc.cpp:546 msgid "minute(s)" msgstr "" #. i18n: file: src/src/generalsettings.ui:99 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) -#: src/rc.cpp:156 src/rc.cpp:348 +#: src/rc.cpp:156 src/rc.cpp:348 src/rc.cpp:549 msgid "hour(s)" msgstr "" #. i18n: file: src/src/generalsettings.ui:106 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_label) -#: src/rc.cpp:159 src/rc.cpp:351 +#: src/rc.cpp:159 src/rc.cpp:351 src/rc.cpp:552 msgid "Store operations history for " msgstr "" #. i18n: file: src/src/generalsettings.ui:116 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) -#: src/rc.cpp:162 src/rc.cpp:354 +#: src/rc.cpp:162 src/rc.cpp:354 src/rc.cpp:555 msgid "Set limit of single operations history size to " msgstr "" #. i18n: file: src/src/generalsettings.ui:129 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) -#: src/rc.cpp:165 src/rc.cpp:357 +#: src/rc.cpp:165 src/rc.cpp:357 src/rc.cpp:558 msgid "MB" msgstr "" #. i18n: file: src/src/generalsettings.ui:156 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:168 src/rc.cpp:360 +#: src/rc.cpp:168 src/rc.cpp:360 src/rc.cpp:561 msgid "If checked, any action needs answer from user within preview" msgstr "" #. i18n: file: src/src/generalsettings.ui:159 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:171 src/rc.cpp:363 +#: src/rc.cpp:171 src/rc.cpp:363 src/rc.cpp:564 msgid "Operate on actions manually" msgstr "" #. i18n: file: src/src/generalsettings.ui:166 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) -#: src/rc.cpp:174 src/rc.cpp:366 +#: src/rc.cpp:174 src/rc.cpp:366 src/rc.cpp:567 msgid "Overwrite operations history file (when full size)" msgstr "" #. i18n: file: src/src/generalsettings.ui:173 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) -#: src/rc.cpp:177 src/rc.cpp:369 +#: src/rc.cpp:177 src/rc.cpp:369 src/rc.cpp:570 msgid "Use system tray icon" msgstr "" #. i18n: file: src/src/choicewindow.ui:533 #. i18n: ectx: property (text), widget (QLabel, no_results_label) -#: src/rc.cpp:186 src/rc.cpp:378 +#: src/rc.cpp:186 src/rc.cpp:378 src/rc.cpp:579 msgid "No results" msgstr "" #. i18n: file: src/src/progressview.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) -#: src/rc.cpp:267 +#: src/rc.cpp:267 src/rc.cpp:468 msgid "Side actions" msgstr "" #. i18n: file: src/src/pak-gui.rc:10 #. i18n: ectx: Menu (Program) -#: src/rc.cpp:312 +#: src/rc.cpp:312 src/rc.cpp:513 msgid "P&rogram" msgstr "" #. i18n: file: src/src/pak-gui.rc:29 #. i18n: ectx: Menu (Settings) -#: src/rc.cpp:321 +#: src/rc.cpp:321 src/rc.cpp:522 msgid "S&ettings" msgstr "" #. i18n: file: src/src/appstylesettings.ui:60 #. i18n: ectx: property (text), widget (QLabel, styles_text) -#: src/rc.cpp:384 +#: src/rc.cpp:384 src/rc.cpp:585 msgid "Application style" msgstr "" +#. i18n: file: src/src/mainwindowview.ui:765 +#. i18n: ectx: property (text), widget (QPushButton, check_updates_button) +#: src/rc.cpp:417 +msgid "Check" +msgstr "" + #: src/settings.cpp:90 msgid "App style change" msgstr "" @@ -804,18 +873,18 @@ msgstr "" msgid "package to update" msgstr "" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "Single AUR/POLAUR packages" msgstr "" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "It's not possible to update single AUR/POLAUR packages" msgstr "" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Uncheck these packages" msgstr "" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Cancel" msgstr "" diff --git a/resources/translations/pl.mo b/resources/translations/pl.mo index 7ee5ecc..cd3057c 100644 Binary files a/resources/translations/pl.mo and b/resources/translations/pl.mo differ diff --git a/resources/translations/pl.po b/resources/translations/pl.po index ee1ac34..dfd8236 100644 --- a/resources/translations/pl.po +++ b/resources/translations/pl.po @@ -50,11 +50,11 @@ msgstr "Nazwa paczki" msgid "Package name cannot be empty" msgstr "Nazwa paczki nie może być pusta" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "Package download failure" msgstr "Błąd podczas pobierania paczki" -#: src/downloadcommandparser.cpp:231 +#: src/downloadcommandparser.cpp:232 msgid "" "Package couldn't be downloaded:\n" "\n" @@ -66,23 +66,23 @@ msgstr "" "Linie z błędami:\n" "%1" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package download" msgstr "Pobranie paczki" -#: src/downloadcommandparser.cpp:236 src/downloadcommandparser.cpp:237 +#: src/downloadcommandparser.cpp:237 src/downloadcommandparser.cpp:238 msgid "and installed" msgstr "i zainstalowane" -#: src/downloadcommandparser.cpp:236 +#: src/downloadcommandparser.cpp:237 msgid "Package %1 has been downloaded %2" msgstr "Paczka %1 została pobrana %2" -#: src/downloadcommandparser.cpp:253 +#: src/downloadcommandparser.cpp:255 msgid "Directory" msgstr "Katalog" -#: src/downloadcommandparser.cpp:254 +#: src/downloadcommandparser.cpp:256 msgid "Do you want to open directory?" msgstr "Czy chcesz otworzyć katalog?" @@ -159,7 +159,9 @@ msgstr "&Skonfiguruj pak-gui" #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1250 #. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) -#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 +#. i18n: file: src/src/mainwindowview.ui:1274 +#. i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +#: src/mainwindowview.cpp:65 src/rc.cpp:69 src/rc.cpp:255 src/rc.cpp:456 msgid "Internet connection state and auracle-git package presence" msgstr "Stan połączenia internetowego i obecność pakietu auracle-git" @@ -167,7 +169,9 @@ msgstr "Stan połączenia internetowego i obecność pakietu auracle-git" #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1263 #. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) -#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 +#. i18n: file: src/src/mainwindowview.ui:1287 +#. i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +#: src/mainwindowview.cpp:66 src/rc.cpp:75 src/rc.cpp:261 src/rc.cpp:462 msgid "Internet connection state and git package presence" msgstr "Stan połączenia internetowego i obecność pakietu git" @@ -175,15 +179,21 @@ msgstr "Stan połączenia internetowego i obecność pakietu git" #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1237 #. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) -#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 +#. i18n: file: src/src/mainwindowview.ui:1261 +#. i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +#: src/mainwindowview.cpp:67 src/rc.cpp:63 src/rc.cpp:249 src/rc.cpp:450 msgid "Internet connection state" msgstr "Stan połączenia internetowego" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:68 +msgid "Press \"Check\" button" +msgstr "Naciśnij przycisk \"Sprawdź\"" + +#: src/mainwindowview.cpp:160 msgid "All processes ended" msgstr "Wszystkie procesy zostały zakończone" -#: src/mainwindowview.cpp:168 +#: src/mainwindowview.cpp:160 msgid "All processes have been completed." msgstr "Wszystkie procesy zostały zakończone." @@ -191,8 +201,8 @@ msgstr "Wszystkie procesy zostały zakończone." #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) #. i18n: file: src/src/mainwindowview.ui:543 #. i18n: ectx: property (text), widget (QLabel, packages_to_update_label) -#: src/mainwindowview.cpp:256 src/mainwindowview.cpp:413 -#: src/mainwindowview.cpp:686 src/rc.cpp:24 src/rc.cpp:210 +#: src/mainwindowview.cpp:218 src/mainwindowview.cpp:348 +#: src/mainwindowview.cpp:635 src/rc.cpp:24 src/rc.cpp:210 src/rc.cpp:408 msgid "TO UPDATE" msgstr "DO ZAKTUALIZOWANIA" @@ -200,32 +210,26 @@ msgstr "DO ZAKTUALIZOWANIA" #. i18n: ectx: property (text), widget (QLabel, accessible_packages) #. i18n: file: src/src/mainwindowview.ui:922 #. i18n: ectx: property (text), widget (QLabel, accessible_packages) -#: src/mainwindowview.cpp:257 src/mainwindowview.cpp:422 -#: src/mainwindowview.cpp:687 src/rc.cpp:45 src/rc.cpp:231 +#. i18n: file: src/src/mainwindowview.ui:946 +#. i18n: ectx: property (text), widget (QLabel, accessible_packages) +#: src/mainwindowview.cpp:219 src/mainwindowview.cpp:357 +#: src/mainwindowview.cpp:636 src/rc.cpp:45 src/rc.cpp:231 src/rc.cpp:432 msgid "AVAILABLE TO INSTALL" msgstr "DOSTĘPNE DO ZAINSTALOWANIA" -#: src/mainwindowview.cpp:265 src/mainwindowview.cpp:267 +#: src/mainwindowview.cpp:227 src/mainwindowview.cpp:229 msgid "No internet connection" msgstr "Brak połączenia internetowego" -#: src/mainwindowview.cpp:280 -msgid "Process abort" -msgstr "Anulowanie procesu" - -#: src/mainwindowview.cpp:280 -msgid "Are you sure about quitting this process?" -msgstr "Czy na pewno chcesz anulować ten proces?" - -#: src/mainwindowview.cpp:310 src/mainwindowview.cpp:329 +#: src/mainwindowview.cpp:250 src/mainwindowview.cpp:269 msgid "Something went wrong. Try to refresh" msgstr "Coś poszło nie tak. Spróbuj odświeżyć" -#: src/mainwindowview.cpp:353 -msgid "Cannot be updated - try to refresh" -msgstr "Nie można zaktualizować kolumny - spróbuj odświeżyć" +#: src/mainwindowview.cpp:292 +msgid "Coldn't be updated" +msgstr "Nie znaleziono aktualizacji" -#: src/mainwindowview.cpp:359 +#: src/mainwindowview.cpp:298 msgid "There aren't packages to update" msgstr "Brak pakietów do zaktualizowania" @@ -233,8 +237,8 @@ msgstr "Brak pakietów do zaktualizowania" #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) #. i18n: file: src/src/mainwindowview.ui:184 #. i18n: ectx: property (text), widget (QLabel, installed_packages_label) -#: src/mainwindowview.cpp:431 src/mainwindowview.cpp:688 src/rc.cpp:6 -#: src/rc.cpp:192 +#: src/mainwindowview.cpp:366 src/mainwindowview.cpp:637 src/rc.cpp:6 +#: src/rc.cpp:192 src/rc.cpp:390 msgid "INSTALLED" msgstr "ZAINSTALOWANE" @@ -250,16 +254,23 @@ msgstr "ZAINSTALOWANE" #. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) #. i18n: file: src/src/mainwindowview.ui:1093 #. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) -#: src/mainwindowview.cpp:486 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 -#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 +#. i18n: file: src/src/mainwindowview.ui:355 +#. i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +#. i18n: file: src/src/mainwindowview.ui:720 +#. i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +#. i18n: file: src/src/mainwindowview.ui:1117 +#. i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +#: src/mainwindowview.cpp:427 src/rc.cpp:12 src/rc.cpp:30 src/rc.cpp:51 +#: src/rc.cpp:198 src/rc.cpp:216 src/rc.cpp:237 src/rc.cpp:396 src/rc.cpp:414 +#: src/rc.cpp:438 msgid "Input" msgstr "Dodaj" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "Quit" msgstr "Zakończ" -#: src/mainwindowview.cpp:624 +#: src/mainwindowview.cpp:572 msgid "" "Application cannot be closed immediately. Try again after end of running " "operations." @@ -267,17 +278,17 @@ msgstr "" "Aplikacja nie może być zamknięta natychmiast. Spróbuj ponownie po " "zakończeniu pracy." -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Process running" msgstr "Proces w toku" -#: src/mainwindowview.cpp:661 +#: src/mainwindowview.cpp:609 msgid "Wait until all major processes are complete" msgstr "Czekaj na zakończenie wszystkich głównych procesów" #. i18n: file: src/src/choicewindow.ui:40 #. i18n: ectx: property (text), widget (QLabel, choice_label) -#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 +#: src/packagedownloader.cpp:92 src/rc.cpp:183 src/rc.cpp:375 src/rc.cpp:576 msgid "Choose path for package save" msgstr "Wybierz ścieżkę zapisu pakietu" @@ -302,7 +313,7 @@ msgstr "AKtualizowanie mirrorów" msgid "update mirrors?" msgstr "zaktualizować mirrory?" -#: src/process.cpp:74 src/updatedpackagescolumn.cpp:152 +#: src/process.cpp:74 src/updatedpackagescolumn.cpp:168 msgid "Update all" msgstr "Aktualizowanie" @@ -350,32 +361,32 @@ msgstr "nie było niemożliwe:" msgid "Select preview and respond to questions manually" msgstr "Zaznacz podgląd i wprowadzaj odpowiedzi manualnie" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "Uninstallation" msgstr "Odinstalowanie" -#: src/process.cpp:494 +#: src/process.cpp:492 msgid "remove package?" msgstr "usunąć paczki?" -#: src/process.cpp:495 +#: src/process.cpp:493 msgid "Installation" msgstr "Instalowanie" -#: src/process.cpp:495 src/process.cpp:496 src/process.cpp:497 -#: src/process.cpp:498 +#: src/process.cpp:493 src/process.cpp:494 src/process.cpp:495 +#: src/process.cpp:496 msgid "install package?" msgstr "zainstalować paczkę?" -#: src/process.cpp:496 +#: src/process.cpp:494 msgid "Installation from Repo" msgstr "Instalacja z Repo" -#: src/process.cpp:497 +#: src/process.cpp:495 msgid "Installation from AUR" msgstr "Instalacja z AUR" -#: src/process.cpp:498 +#: src/process.cpp:496 msgid "Installation from POLAUR" msgstr "Instalacja z POLAUR" @@ -383,15 +394,18 @@ msgstr "Instalacja z POLAUR" #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) #. i18n: file: src/src/mainwindowview.ui:768 #. i18n: ectx: property (text), widget (QPushButton, update_packages_button) -#: src/process.cpp:499 src/rc.cpp:33 src/rc.cpp:219 src/systemtray.cpp:50 +#. i18n: file: src/src/mainwindowview.ui:792 +#. i18n: ectx: property (text), widget (QPushButton, update_packages_button) +#: src/process.cpp:497 src/rc.cpp:33 src/rc.cpp:219 src/rc.cpp:420 +#: src/systemtray.cpp:50 msgid "Update" msgstr "Aktualizuj" -#: src/process.cpp:499 +#: src/process.cpp:497 msgid "update package?" msgstr "zaktualizować paczki?" -#: src/process.cpp:538 +#: src/process.cpp:536 msgid "Are you sure you want to %1" msgstr "Czy naprawdę chcesz %1" @@ -399,7 +413,7 @@ msgstr "Czy naprawdę chcesz %1" #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) #. i18n: file: src/src/mainwindowview.ui:95 #. i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) -#: src/rc.cpp:3 src/rc.cpp:189 +#: src/rc.cpp:3 src/rc.cpp:189 src/rc.cpp:387 msgid "View progress" msgstr "Sprawdź postęp" @@ -415,8 +429,14 @@ msgstr "Sprawdź postęp" #. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) #. i18n: file: src/src/mainwindowview.ui:967 #. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +#. i18n: file: src/src/mainwindowview.ui:229 +#. i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +#. i18n: file: src/src/mainwindowview.ui:588 +#. i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +#. i18n: file: src/src/mainwindowview.ui:991 +#. i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) #: src/rc.cpp:9 src/rc.cpp:27 src/rc.cpp:48 src/rc.cpp:195 src/rc.cpp:213 -#: src/rc.cpp:234 +#: src/rc.cpp:234 src/rc.cpp:393 src/rc.cpp:411 src/rc.cpp:435 msgid "Reverse sorting" msgstr "Odwróc sortowanie" @@ -424,7 +444,7 @@ msgstr "Odwróc sortowanie" #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) #. i18n: file: src/src/mainwindowview.ui:403 #. i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) -#: src/rc.cpp:15 src/rc.cpp:201 +#: src/rc.cpp:15 src/rc.cpp:201 src/rc.cpp:399 msgid "Uninstall" msgstr "Odinstaluj" @@ -440,8 +460,14 @@ msgstr "Odinstaluj" #. i18n: ectx: property (text), widget (QCheckBox, console_view_update) #. i18n: file: src/src/mainwindowview.ui:1184 #. i18n: ectx: property (text), widget (QCheckBox, console_view_install) +#. i18n: file: src/src/mainwindowview.ui:446 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +#. i18n: file: src/src/mainwindowview.ui:835 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_update) +#. i18n: file: src/src/mainwindowview.ui:1208 +#. i18n: ectx: property (text), widget (QCheckBox, console_view_install) #: src/rc.cpp:18 src/rc.cpp:36 src/rc.cpp:57 src/rc.cpp:204 src/rc.cpp:222 -#: src/rc.cpp:243 +#: src/rc.cpp:243 src/rc.cpp:402 src/rc.cpp:423 src/rc.cpp:444 msgid "Preview" msgstr "Podgląd" @@ -457,8 +483,14 @@ msgstr "Podgląd" #. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) #. i18n: file: src/src/mainwindowview.ui:1198 #. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:460 +#. i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +#. i18n: file: src/src/mainwindowview.ui:849 +#. i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +#. i18n: file: src/src/mainwindowview.ui:1222 +#. i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) #: src/rc.cpp:21 src/rc.cpp:39 src/rc.cpp:60 src/rc.cpp:207 src/rc.cpp:225 -#: src/rc.cpp:246 +#: src/rc.cpp:246 src/rc.cpp:405 src/rc.cpp:426 src/rc.cpp:447 msgid "Search" msgstr "Wyszukiwanie" @@ -466,7 +498,9 @@ msgstr "Wyszukiwanie" #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) #. i18n: file: src/src/mainwindowview.ui:839 #. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) -#: src/rc.cpp:42 src/rc.cpp:228 +#. i18n: file: src/src/mainwindowview.ui:863 +#. i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +#: src/rc.cpp:42 src/rc.cpp:228 src/rc.cpp:429 msgid "Check all" msgstr "Zaznacz wszystko" @@ -474,7 +508,9 @@ msgstr "Zaznacz wszystko" #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) #. i18n: file: src/src/mainwindowview.ui:1141 #. i18n: ectx: property (text), widget (QPushButton, install_packages_button) -#: src/rc.cpp:54 src/rc.cpp:240 +#. i18n: file: src/src/mainwindowview.ui:1165 +#. i18n: ectx: property (text), widget (QPushButton, install_packages_button) +#: src/rc.cpp:54 src/rc.cpp:240 src/rc.cpp:441 msgid "Install" msgstr "Instaluj" @@ -482,7 +518,9 @@ msgstr "Instaluj" #. i18n: ectx: property (text), widget (QLabel, repo_led_label) #. i18n: file: src/src/mainwindowview.ui:1240 #. i18n: ectx: property (text), widget (QLabel, repo_led_label) -#: src/rc.cpp:66 src/rc.cpp:252 +#. i18n: file: src/src/mainwindowview.ui:1264 +#. i18n: ectx: property (text), widget (QLabel, repo_led_label) +#: src/rc.cpp:66 src/rc.cpp:252 src/rc.cpp:453 msgid "Repositories" msgstr "Repozytoria" @@ -490,7 +528,9 @@ msgstr "Repozytoria" #. i18n: ectx: property (text), widget (QLabel, aur_led_label) #. i18n: file: src/src/mainwindowview.ui:1253 #. i18n: ectx: property (text), widget (QLabel, aur_led_label) -#: src/rc.cpp:72 src/rc.cpp:258 +#. i18n: file: src/src/mainwindowview.ui:1277 +#. i18n: ectx: property (text), widget (QLabel, aur_led_label) +#: src/rc.cpp:72 src/rc.cpp:258 src/rc.cpp:459 msgid "AUR" msgstr "AUR" @@ -498,7 +538,9 @@ msgstr "AUR" #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) #. i18n: file: src/src/mainwindowview.ui:1266 #. i18n: ectx: property (text), widget (QLabel, polaur_led_label) -#: src/rc.cpp:78 src/rc.cpp:264 +#. i18n: file: src/src/mainwindowview.ui:1290 +#. i18n: ectx: property (text), widget (QLabel, polaur_led_label) +#: src/rc.cpp:78 src/rc.cpp:264 src/rc.cpp:465 msgid "POLAUR" msgstr "POLAUR" @@ -506,7 +548,7 @@ msgstr "POLAUR" #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) #. i18n: file: src/src/choicewindow.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) -#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 +#: src/rc.cpp:81 src/rc.cpp:180 src/rc.cpp:372 src/rc.cpp:573 msgid "Dialog" msgstr "Postęp" @@ -514,7 +556,7 @@ msgstr "Postęp" #. i18n: ectx: attribute (title), widget (QWidget, tab1) #. i18n: file: src/src/progressview.ui:28 #. i18n: ectx: attribute (title), widget (QWidget, tab1) -#: src/rc.cpp:84 src/rc.cpp:270 +#: src/rc.cpp:84 src/rc.cpp:270 src/rc.cpp:471 msgid "Tab 1" msgstr "Zakładka 1" @@ -522,7 +564,7 @@ msgstr "Zakładka 1" #. i18n: ectx: attribute (title), widget (QWidget, tab2) #. i18n: file: src/src/progressview.ui:57 #. i18n: ectx: attribute (title), widget (QWidget, tab2) -#: src/rc.cpp:87 src/rc.cpp:273 +#: src/rc.cpp:87 src/rc.cpp:273 src/rc.cpp:474 msgid "Tab 2" msgstr "Zakładka 2" @@ -544,62 +586,73 @@ msgstr "Zakładka 2" #. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) #. i18n: file: src/src/appstylesettings.ui:14 #. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +#. i18n: file: src/src/previewsappearancesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +#. i18n: file: src/src/logssettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +#. i18n: file: src/src/packageinput.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +#. i18n: file: src/src/packagesinfosettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +#. i18n: file: src/src/appstylesettings.ui:14 +#. i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) #: src/rc.cpp:90 src/rc.cpp:105 src/rc.cpp:120 src/rc.cpp:135 src/rc.cpp:276 -#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 +#: src/rc.cpp:291 src/rc.cpp:306 src/rc.cpp:327 src/rc.cpp:381 src/rc.cpp:477 +#: src/rc.cpp:492 src/rc.cpp:507 src/rc.cpp:528 src/rc.cpp:582 msgid "Form" msgstr "Podstęp" #. i18n: file: src/src/previewsappearancesettings.ui:41 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:93 src/rc.cpp:279 +#: src/rc.cpp:93 src/rc.cpp:279 src/rc.cpp:480 msgid "background color " msgstr "kolor tła " #. i18n: file: src/src/previewsappearancesettings.ui:57 #. i18n: ectx: property (text), widget (QLabel, label_2) -#: src/rc.cpp:96 src/rc.cpp:282 +#: src/rc.cpp:96 src/rc.cpp:282 src/rc.cpp:483 msgid "font color" msgstr "kolor czcionki" #. i18n: file: src/src/previewsappearancesettings.ui:71 #. i18n: ectx: property (text), widget (QLabel, label_3) -#: src/rc.cpp:99 src/rc.cpp:285 +#: src/rc.cpp:99 src/rc.cpp:285 src/rc.cpp:486 msgid "font family" msgstr "rodzaj czcionki" #. i18n: file: src/src/previewsappearancesettings.ui:98 #. i18n: ectx: property (text), widget (QLabel, label_4) -#: src/rc.cpp:102 src/rc.cpp:288 +#: src/rc.cpp:102 src/rc.cpp:288 src/rc.cpp:489 msgid "font size " msgstr "wielkość czionki " #. i18n: file: src/src/logssettings.ui:39 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) -#: src/rc.cpp:108 src/rc.cpp:294 +#: src/rc.cpp:108 src/rc.cpp:294 src/rc.cpp:495 msgid "Save logs into file" msgstr "Zapisz logi do pliku" #. i18n: file: src/src/logssettings.ui:49 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:111 src/rc.cpp:297 +#: src/rc.cpp:111 src/rc.cpp:297 src/rc.cpp:498 msgid "in path" msgstr "w ścieżce" #. i18n: file: src/src/logssettings.ui:67 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) -#: src/rc.cpp:114 src/rc.cpp:300 +#: src/rc.cpp:114 src/rc.cpp:300 src/rc.cpp:501 msgid "show debug" msgstr "pokazuj logi debug" #. i18n: file: src/src/logssettings.ui:74 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) -#: src/rc.cpp:117 src/rc.cpp:303 +#: src/rc.cpp:117 src/rc.cpp:303 src/rc.cpp:504 msgid "hide information logs" msgstr "schowaj logi informacyjne" #. i18n: file: src/src/packageinput.ui:38 #. i18n: ectx: property (text), widget (QLabel, label) -#: src/rc.cpp:123 src/rc.cpp:309 +#: src/rc.cpp:123 src/rc.cpp:309 src/rc.cpp:510 msgid "Enter the package name" msgstr "Wprowadź nazwę paczki" @@ -607,7 +660,7 @@ msgstr "Wprowadź nazwę paczki" #. i18n: ectx: Menu (Actions) #. i18n: file: src/src/pak-gui.rc:14 #. i18n: ectx: Menu (Actions) -#: src/rc.cpp:126 src/rc.cpp:315 +#: src/rc.cpp:126 src/rc.cpp:315 src/rc.cpp:516 msgid "A&ctions" msgstr "A&kcje" @@ -615,7 +668,7 @@ msgstr "A&kcje" #. i18n: ectx: Menu (Print) #. i18n: file: src/src/pak-gui.rc:25 #. i18n: ectx: Menu (Print) -#: src/rc.cpp:129 src/rc.cpp:318 +#: src/rc.cpp:129 src/rc.cpp:318 src/rc.cpp:519 msgid "P&rint" msgstr "W&yświetl" @@ -623,7 +676,7 @@ msgstr "W&yświetl" #. i18n: ectx: ToolBar (mainToolBar) #. i18n: file: src/src/pak-gui.rc:38 #. i18n: ectx: ToolBar (mainToolBar) -#: src/rc.cpp:132 src/rc.cpp:324 +#: src/rc.cpp:132 src/rc.cpp:324 src/rc.cpp:525 msgid "Main Toolbar" msgstr "Główny pasek narzędzi" @@ -635,19 +688,24 @@ msgstr "Główny pasek narzędzi" #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) #. i18n: file: src/src/generalsettings.ui:75 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) -#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 +#. i18n: file: src/src/generalsettings.ui:48 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +#. i18n: file: src/src/generalsettings.ui:75 +#. i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +#: src/rc.cpp:138 src/rc.cpp:147 src/rc.cpp:330 src/rc.cpp:339 src/rc.cpp:531 +#: src/rc.cpp:540 msgid "day(s)" msgstr "dni" #. i18n: file: src/src/generalsettings.ui:55 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) -#: src/rc.cpp:141 src/rc.cpp:333 +#: src/rc.cpp:141 src/rc.cpp:333 src/rc.cpp:534 msgid "Check packages ready to update every " msgstr "Sprawdzaj pakiety gotowe do aktualizacji co " #. i18n: file: src/src/generalsettings.ui:65 #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) -#: src/rc.cpp:144 src/rc.cpp:336 +#: src/rc.cpp:144 src/rc.cpp:336 src/rc.cpp:537 msgid "Try to reconnect to the internet every " msgstr "Próbuj ponownie połączyć się z internetem co " @@ -659,88 +717,99 @@ msgstr "Próbuj ponownie połączyć się z internetem co " #. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) #. i18n: file: src/src/generalsettings.ui:92 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) -#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 +#. i18n: file: src/src/generalsettings.ui:82 +#. i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +#. i18n: file: src/src/generalsettings.ui:92 +#. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +#: src/rc.cpp:150 src/rc.cpp:153 src/rc.cpp:342 src/rc.cpp:345 src/rc.cpp:543 +#: src/rc.cpp:546 msgid "minute(s)" msgstr "minuty" #. i18n: file: src/src/generalsettings.ui:99 #. i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) -#: src/rc.cpp:156 src/rc.cpp:348 +#: src/rc.cpp:156 src/rc.cpp:348 src/rc.cpp:549 msgid "hour(s)" msgstr "godziny" #. i18n: file: src/src/generalsettings.ui:106 #. i18n: ectx: property (text), widget (QLabel, store_operations_history_label) -#: src/rc.cpp:159 src/rc.cpp:351 +#: src/rc.cpp:159 src/rc.cpp:351 src/rc.cpp:552 msgid "Store operations history for " msgstr "Przechowuj historię operacji przez " #. i18n: file: src/src/generalsettings.ui:116 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) -#: src/rc.cpp:162 src/rc.cpp:354 +#: src/rc.cpp:162 src/rc.cpp:354 src/rc.cpp:555 msgid "Set limit of single operations history size to " msgstr "Ustaw limit wielkości historii pojedynczych operacji do " #. i18n: file: src/src/generalsettings.ui:129 #. i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) -#: src/rc.cpp:165 src/rc.cpp:357 +#: src/rc.cpp:165 src/rc.cpp:357 src/rc.cpp:558 msgid "MB" msgstr "MB" #. i18n: file: src/src/generalsettings.ui:156 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:168 src/rc.cpp:360 +#: src/rc.cpp:168 src/rc.cpp:360 src/rc.cpp:561 msgid "If checked, any action needs answer from user within preview" msgstr "Każdy proces z podglądem wymaga manualnej odpowiedzi od użytkownika" #. i18n: file: src/src/generalsettings.ui:159 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) -#: src/rc.cpp:171 src/rc.cpp:363 +#: src/rc.cpp:171 src/rc.cpp:363 src/rc.cpp:564 msgid "Operate on actions manually" msgstr "Operuj na procesach manualnie" #. i18n: file: src/src/generalsettings.ui:166 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) -#: src/rc.cpp:174 src/rc.cpp:366 +#: src/rc.cpp:174 src/rc.cpp:366 src/rc.cpp:567 msgid "Overwrite operations history file (when full size)" msgstr "Nadpisuj plik z historią operacji (przy przepełnieniu)" #. i18n: file: src/src/generalsettings.ui:173 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) -#: src/rc.cpp:177 src/rc.cpp:369 +#: src/rc.cpp:177 src/rc.cpp:369 src/rc.cpp:570 msgid "Use system tray icon" msgstr "Użyj ikony w pasku systemowym" #. i18n: file: src/src/choicewindow.ui:533 #. i18n: ectx: property (text), widget (QLabel, no_results_label) -#: src/rc.cpp:186 src/rc.cpp:378 +#: src/rc.cpp:186 src/rc.cpp:378 src/rc.cpp:579 msgid "No results" msgstr "Brak wyników" #. i18n: file: src/src/progressview.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) -#: src/rc.cpp:267 +#: src/rc.cpp:267 src/rc.cpp:468 msgid "Side actions" msgstr "Poboczne akcje" #. i18n: file: src/src/pak-gui.rc:10 #. i18n: ectx: Menu (Program) -#: src/rc.cpp:312 +#: src/rc.cpp:312 src/rc.cpp:513 msgid "P&rogram" msgstr "P&rogram" #. i18n: file: src/src/pak-gui.rc:29 #. i18n: ectx: Menu (Settings) -#: src/rc.cpp:321 +#: src/rc.cpp:321 src/rc.cpp:522 msgid "S&ettings" msgstr "U&stawienia" #. i18n: file: src/src/appstylesettings.ui:60 #. i18n: ectx: property (text), widget (QLabel, styles_text) -#: src/rc.cpp:384 +#: src/rc.cpp:384 src/rc.cpp:585 msgid "Application style" msgstr "Motyw aplikacji" +#. i18n: file: src/src/mainwindowview.ui:765 +#. i18n: ectx: property (text), widget (QPushButton, check_updates_button) +#: src/rc.cpp:417 +msgid "Check" +msgstr "Sprawdź" + #: src/settings.cpp:90 msgid "App style change" msgstr "Zmiana motywu aplikacji" @@ -778,22 +847,31 @@ msgstr "paczek do aktualizacji" msgid "package to update" msgstr "paczka do aktualizacji" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "Single AUR/POLAUR packages" msgstr "Pojedyncze paczki AUR/POLAUR" -#: src/updatedpackagescolumn.cpp:151 +#: src/updatedpackagescolumn.cpp:167 msgid "It's not possible to update single AUR/POLAUR packages" msgstr "Nie ma możliwości aktualizowania pojedynczych paczek AUR/POLAUR" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Uncheck these packages" msgstr "Odznacz te paczki" -#: src/updatedpackagescolumn.cpp:152 +#: src/updatedpackagescolumn.cpp:168 msgid "Cancel" msgstr "Anuluj" +#~ msgid "Process abort" +#~ msgstr "Anulowanie procesu" + +#~ msgid "Are you sure about quitting this process?" +#~ msgstr "Czy na pewno chcesz anulować ten proces?" + +#~ msgid "Cannot be updated - try to refresh" +#~ msgstr "Nie można zaktualizować kolumny - spróbuj odświeżyć" + #~ msgid "%2 packages to update" #~ msgstr "%2 paczek do aktualizacji" diff --git a/src/src/availablepackagescolumn.cpp b/src/src/availablepackagescolumn.cpp index 81e7d53..60ee159 100644 --- a/src/src/availablepackagescolumn.cpp +++ b/src/src/availablepackagescolumn.cpp @@ -62,36 +62,24 @@ void AvailablePackagesColumn::clearPackages() } -void AvailablePackagesColumn::setForcedUpdateFlag() -{ - isForcedUpdate = true; -} - - -void AvailablePackagesColumn::clearForcedUpdateFlag() -{ - isForcedUpdate = false; -} - - void AvailablePackagesColumn::fill() { mutex.lock(); + bool was_condition_needed = is_condition_needed; #ifdef RUN_TESTS QDeadlineTimer deadline(getWaitTime()); condition.wait(&mutex, deadline); #else - condition.wait(&mutex); + if (is_condition_needed) + condition.wait(&mutex); #endif + is_condition_needed = true; const QStringList& pak_packages = getPackagesList(); - const QString text_log_column{"Available"}; - if (!isForcedUpdate && isColumnNotChanged(text_log_column, pak_packages)) - { - mutex.unlock(); - return; - } + + if (!was_condition_needed) + wakeUpOtherColumns(); packages_sorter->resetOriginalList(); Q_ASSERT(packages_sorter->isOriginalListEmpty()); @@ -110,11 +98,11 @@ void AvailablePackagesColumn::fill() i++; }); - clearForcedUpdateFlag(); Logger::logger()->logInfo(QStringLiteral("Filled column with %1 available packages").arg(list_widget->count())); list_widget->update(); mutex.unlock(); + is_condition_needed = false; } @@ -125,6 +113,12 @@ void AvailablePackagesColumn::clearForSort() } +void AvailablePackagesColumn::wakeUpOtherColumns() +{ + condition.wakeAll(); +} + + void AvailablePackagesColumn::fillForSort() { if (!search_lineedit) diff --git a/src/src/availablepackagescolumn.h b/src/src/availablepackagescolumn.h index 95b7cde..7be7321 100644 --- a/src/src/availablepackagescolumn.h +++ b/src/src/availablepackagescolumn.h @@ -40,14 +40,12 @@ class AvailablePackagesColumn : public PackagesColumn void clearForSort(); void fillForSort(); void clearPackages(); - void setForcedUpdateFlag(); - void clearForcedUpdateFlag(); protected: virtual QStringList getPackagesList(); + void wakeUpOtherColumns(); private: QMutex mutex; - bool isForcedUpdate{false}; }; diff --git a/src/src/checkcommandparser.cpp b/src/src/checkcommandparser.cpp index 1c391b6..1f4ff47 100644 --- a/src/src/checkcommandparser.cpp +++ b/src/src/checkcommandparser.cpp @@ -17,7 +17,6 @@ // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #include "checkcommandparser.h" -#include "logger.h" #include #include diff --git a/src/src/downloadcommandparser.cpp b/src/src/downloadcommandparser.cpp index bd2aebf..5a98a6e 100644 --- a/src/src/downloadcommandparser.cpp +++ b/src/src/downloadcommandparser.cpp @@ -51,9 +51,9 @@ void DownloadCommandParser::connectSignals() return; QObject::connect(this, &DownloadCommandParser::ended, this, [this]() { clearAfterExecution(pak_download); }); - QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), [this]() { emit ended(); }); - QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), this, &DownloadCommandParser::validateFinishedOutput); - QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), this, &DownloadCommandParser::showDirectory); + QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), [this]() { emit ended(); }); + QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), this, &DownloadCommandParser::validateFinishedOutput); + QObject::connect(pak_download.get(), QOverload::of(&QProcess::finished), this, &DownloadCommandParser::showDirectory); QObject::connect(pak_download.get(), &QProcess::errorOccurred, [this]() { if (!isTerminated) Logger::logger()->logWarning(QStringLiteral("Error during download: %1").arg(pak_download->errorString())); @@ -219,12 +219,13 @@ QStringList DownloadCommandParser::retrieveInfo() } -bool DownloadCommandParser::validateFinishedOutput(int exit_code) +bool DownloadCommandParser::validateFinishedOutput(int exit_code, QProcess::ExitStatus exit_status) { Q_UNUSED(exit_code) + Q_UNUSED(exit_status) - if (isTerminated) - return false; + if (isTerminated) + return false; if (!isPackageAlreadyDownloaded()) { @@ -239,9 +240,10 @@ bool DownloadCommandParser::validateFinishedOutput(int exit_code) } -void DownloadCommandParser::showDirectory(int exit_code) +void DownloadCommandParser::showDirectory(int exit_code, QProcess::ExitStatus exit_status) { Q_UNUSED(exit_code) + Q_UNUSED(exit_status) if (isTerminated || !isPackageAlreadyDownloaded()) return; diff --git a/src/src/downloadcommandparser.h b/src/src/downloadcommandparser.h index d8c096b..a406299 100644 --- a/src/src/downloadcommandparser.h +++ b/src/src/downloadcommandparser.h @@ -52,8 +52,8 @@ class DownloadCommandParser : public CommandParser void ended(); protected Q_SLOTS: - virtual bool validateFinishedOutput(int exit_code); - virtual void showDirectory(int exit_code); + virtual bool validateFinishedOutput(int exit_code, QProcess::ExitStatus exit_status); + virtual void showDirectory(int exit_code, QProcess::ExitStatus exit_status); private: bool validate(); diff --git a/src/src/installedpackagescolumn.cpp b/src/src/installedpackagescolumn.cpp index 2283447..5418fb3 100644 --- a/src/src/installedpackagescolumn.cpp +++ b/src/src/installedpackagescolumn.cpp @@ -61,18 +61,6 @@ void InstalledPackagesColumn::clearPackages() } -void InstalledPackagesColumn::setForcedUpdateFlag() -{ - isForcedUpdate = true; -} - - -void InstalledPackagesColumn::clearForcedUpdateFlag() -{ - isForcedUpdate = false; -} - - void InstalledPackagesColumn::fill() { mutex.lock(); @@ -81,17 +69,11 @@ void InstalledPackagesColumn::fill() QDeadlineTimer deadline(getWaitTime()); condition.wait(&mutex, deadline); #else - condition.wait(&mutex); + if (is_condition_needed) + condition.wait(&mutex); #endif const QStringList& pak_packages = getPackagesList(); - const QString text_log_column{"Installed"}; - if (!isForcedUpdate && isColumnNotChanged(text_log_column, pak_packages)) - { - mutex.unlock(); - return; - } - packages_sorter->resetOriginalList(); Q_ASSERT(packages_sorter->isOriginalListEmpty()); clearPackages(); @@ -108,7 +90,6 @@ void InstalledPackagesColumn::fill() i++; }); - clearForcedUpdateFlag(); Logger::logger()->logInfo(QStringLiteral("Filled column with %1 installed packages").arg(list_widget->count())); list_widget->update(); mutex.unlock(); diff --git a/src/src/installedpackagescolumn.h b/src/src/installedpackagescolumn.h index bbc217c..0fea4cc 100644 --- a/src/src/installedpackagescolumn.h +++ b/src/src/installedpackagescolumn.h @@ -38,15 +38,12 @@ class InstalledPackagesColumn : public PackagesColumn void clearForSort(); void fillForSort(); void clearPackages(); - void setForcedUpdateFlag(); - void clearForcedUpdateFlag(); protected: virtual QStringList getPackagesList(); private: QMutex mutex; - bool isForcedUpdate{false}; }; diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp index 1895759..db6fe50 100644 --- a/src/src/mainwindow.cpp +++ b/src/src/mainwindow.cpp @@ -136,9 +136,9 @@ void MainWindow::reportBug() } -void MainWindow::prepareMainWindowView(MainWindowView* main_window_view) +void MainWindow::prepareMainWindowView(MainWindowView* new_main_window_view) { - this->main_window_view = main_window_view; + main_window_view = new_main_window_view; main_window_view->setProcess(process.toWeakRef()); main_window_view->setActionsAccessChecker(actions_access_checker.toWeakRef()); main_window_view->init(); @@ -269,7 +269,6 @@ void MainWindow::initSignals() connect(main_window_view, &MainWindowView::initStarted, this, [this](){ initEnded = false; }); connect(main_window_view, &MainWindowView::initEnded, this, [this](){ initEnded = true; }); connect(main_window_view, &MainWindowView::hideOnlineActions, this, &MainWindow::disableOnlineActions); - connect(this, &MainWindow::updatedPackageInfoList, main_window_view, &MainWindowView::setForcedUpdateFlag); connect(this, &MainWindow::updatedPackageInfoList, main_window_view, &MainWindowView::refresh); connect(actions_access_checker.get(), &ActionsAccessChecker::reflectorAccessChanged, [this](bool is_installed) { update_mirrors_action->setEnabled(initEnded && is_installed); }); diff --git a/src/src/mainwindowview.cpp b/src/src/mainwindowview.cpp index bf0ef92..84e5e9f 100644 --- a/src/src/mainwindowview.cpp +++ b/src/src/mainwindowview.cpp @@ -65,6 +65,9 @@ MainWindowView::MainWindowView(QWidget *parent) m_ui.aur_led_label->setToolTip(i18n("Internet connection state and auracle-git package presence")); m_ui.polaur_led_label->setToolTip(i18n("Internet connection state and git package presence")); m_ui.repo_led_label->setToolTip(i18n("Internet connection state")); + m_ui.update_spinning_label->setText(i18n("Press \"Check\" button")); + m_ui.update_spinning_label->setHidden(false); + m_ui.update_spinning_label->setStyleSheet("color: black; font-size: 15px;"); } @@ -100,7 +103,9 @@ void MainWindowView::init() main_window_view_signals->initColumns(); main_window_view_signals->initSignals(); - hideWidgets(); + blockInstallationColumn(); + blockAvailableColumn(); + blockUpdateColumn(); main_window_view_signals->startInternetCheckTimer(); main_window_view_signals->startPackagesCheckTimer(); @@ -111,8 +116,6 @@ void MainWindowView::init() void MainWindowView::run() { - checkUpdates(); - m_ui.available_packages_list->hide(); m_ui.installed_packages_list->hide(); m_ui.search_available_packages_checkbox->setEnabled(false); @@ -122,7 +125,7 @@ void MainWindowView::run() } -void MainWindowView::hideWidgets() +void MainWindowView::blockInstallationColumn() { m_ui.sort_installed_packages->setCheckState(Qt::Unchecked); m_ui.search_installed_packages_lineedit->clear(); @@ -135,31 +138,20 @@ void MainWindowView::hideWidgets() m_ui.sort_installed_packages->hide(); m_ui.search_installed_packages_lineedit->hide(); m_ui.installed_packages_list->hide(); - hideWidgetsExceptInstalled(); } -void MainWindowView::hideWidgetsExceptInstalled() +void MainWindowView::blockAvailableColumn() { - m_ui.search_packages_to_update_lineedit->clear(); m_ui.search_available_packages_lineedit->clear(); m_ui.sort_available_packages->setCheckState(Qt::Unchecked); - m_ui.sort_packages_to_update->setCheckState(Qt::Unchecked); m_ui.search_available_packages_checkbox->setCheckState(Qt::Unchecked); m_ui.console_view_install->setCheckState(Qt::Unchecked); - m_ui.check_all_updates_checkbox->setCheckState(Qt::Unchecked); - m_ui.search_packages_to_update_checkbox->setCheckState(Qt::Unchecked); - m_ui.console_view_update->setCheckState(Qt::Unchecked); - - m_ui.updated_preview_area->hide(); m_ui.available_preview_area->hide(); m_ui.sort_available_packages->hide(); - m_ui.sort_packages_to_update->hide(); - m_ui.search_packages_to_update_lineedit->hide(); m_ui.search_available_packages_lineedit->hide(); m_ui.available_packages_list->hide(); - m_ui.packages_to_update_list->hide(); } @@ -193,30 +185,20 @@ void MainWindowView::updatePreviewsDesign() } -// TODOJG - to strategy design pattern -void MainWindowView::clearMainPreviews(Process::Task task) +void MainWindowView::showUpdatedPackagesWidgets() { - if ((Process::Task::UpdateAll == task) || - (Process::Task::Update == task)) - { - //m_ui.text_browser_tab_update->clear(); - m_ui.input_for_update_lineedit->clear(); - m_ui.input_update_widget->setHidden(true); - } - - if (Process::Task::Install == task) + if (m_ui.packages_to_update_list->count() > 0) { - //m_ui.text_browser_tab_install->clear(); - m_ui.input_for_install_lineedit->clear(); - m_ui.input_install_widget->setHidden(true); + m_ui.packages_to_update_list->show(); + m_ui.search_packages_to_update_checkbox->setEnabled(true); + m_ui.check_all_updates_checkbox->setEnabled(true); + m_ui.update_packages_button->setEnabled(false); + m_ui.sort_packages_to_update->setEnabled(true); + m_ui.search_packages_to_update_lineedit->setEnabled(true); } - if (Process::Task::Uninstall == task) - { - //m_ui.text_browser_tab_uninstall->clear(); - m_ui.input_for_uninstall_lineedit->clear(); - m_ui.input_uninstall_widget->setHidden(true); - } + m_ui.update_spinning_widget->hide(); + m_ui.check_updates_button->setDisabled(false); } @@ -224,9 +206,7 @@ void MainWindowView::disconnectSortSignals() { disconnect(m_ui.sort_installed_packages, &QCheckBox::toggled, installed_packages_column.data(), &InstalledPackagesColumn::sort); installed_packages_column->clearForSort(); - disconnect(m_ui.sort_packages_to_update, &QCheckBox::toggled, updated_packages_column.data(), &UpdatedPackagesColumn::sort); disconnect(m_ui.sort_available_packages, &QCheckBox::toggled, available_packages_column.data(), &AvailablePackagesColumn::sort); - updated_packages_column->clearForSort(); available_packages_column->clearForSort(); } @@ -235,9 +215,7 @@ void MainWindowView::reconnectSortSignals() { connect(m_ui.sort_installed_packages, &QCheckBox::toggled, installed_packages_column.data(), &InstalledPackagesColumn::sort); installed_packages_column->fillForSort(); - connect(m_ui.sort_packages_to_update, &QCheckBox::toggled, updated_packages_column.data(), &UpdatedPackagesColumn::sort); connect(m_ui.sort_available_packages, &QCheckBox::toggled, available_packages_column.data(), &AvailablePackagesColumn::sort); - updated_packages_column->fillForSort(); available_packages_column->fillForSort(); } @@ -253,6 +231,7 @@ void MainWindowView::toggleWidgetsAccess(bool is_online) if (is_online) { m_ui.repos_kled->on(); + m_ui.check_updates_button->setDisabled(false); m_ui.packages_to_update_label->setText(i18n("TO UPDATE")); m_ui.accessible_packages->setText(i18n("AVAILABLE TO INSTALL")); refresh(); @@ -267,36 +246,14 @@ void MainWindowView::toggleWidgetsAccess(bool is_online) m_ui.accessible_packages->setText(i18n("No internet connection")); m_ui.update_spinning_widget->hide(); m_ui.installation_spinning_widget->hide(); + m_ui.check_updates_button->setDisabled(true); emit hideOnlineActions(); - hideWidgetsExceptInstalled(); -} - - -void MainWindowView::abortProcessFromButton(QProcess* process, QPushButton* button) -{ - if (!process) - return; - - int answer = QMessageBox::question(this, i18n("Process abort"), i18n("Are you sure about quitting this process?"), QMessageBox::Yes | QMessageBox::No); - if (static_cast(answer) == QMessageBox::Yes) - { - process->closeReadChannel(QProcess::StandardOutput); - process->closeReadChannel(QProcess::StandardError); - process->closeWriteChannel(); - process->close(); - process->kill(); - button->hide(); - - if (process->isOpen()) - process->terminate(); - - if (!updated_packages_column.isNull()) - updated_packages_column->wakeUpOtherColumns(); - } + blockAvailableColumn(); + blockUpdateColumn(); } -void MainWindowView::connectSignalsForAvailablePackages() +void MainWindowView::updateWidgetsForAvailablePackages() { if (m_ui.available_packages_list->count() > 0) { @@ -315,7 +272,7 @@ void MainWindowView::connectSignalsForAvailablePackages() } -void MainWindowView::connectSignalsForInstalledPackages() +void MainWindowView::updateWidgetsForInstalledPackages() { if (m_ui.installed_packages_list->count() > 0) { @@ -334,23 +291,12 @@ void MainWindowView::connectSignalsForInstalledPackages() } -void MainWindowView::connectSignalsForUpdatedPackages() +void MainWindowView::updateWidgetsForUpdatedPackages() { - if (m_ui.packages_to_update_list->count() > 0) - { - m_ui.packages_to_update_list->show(); - m_ui.search_packages_to_update_checkbox->setEnabled(true); - m_ui.check_all_updates_checkbox->setEnabled(true); - m_ui.update_packages_button->setEnabled(false); - m_ui.sort_packages_to_update->setEnabled(true); - m_ui.search_packages_to_update_lineedit->setEnabled(true); - - } - if (m_ui.packages_to_update_list->count() == 0 && (actions_access_checker.isNull() || !actions_access_checker->isOnline())) { m_ui.packages_to_update_label->setStyleSheet("color: black; font-size: 15px;"); - m_ui.packages_to_update_label->setText(i18n("Cannot be updated - try to refresh")); + m_ui.packages_to_update_label->setText(i18n("Couldn't be updated")); } if (m_ui.packages_to_update_list->count() == 0 && !actions_access_checker.isNull() && actions_access_checker->isOnline()) @@ -359,8 +305,7 @@ void MainWindowView::connectSignalsForUpdatedPackages() m_ui.packages_to_update_label->setText(i18n("There aren't packages to update")); } - m_ui.update_spinning_widget->hide(); - checkSpinningVisibility(); + showUpdatedPackagesWidgets(); } @@ -373,13 +318,9 @@ void MainWindowView::checkSpinningVisibility() emit initEnded(); Logger::logger()->logInfo(QStringLiteral("Refresh/initialization ended")); - if (!m_ui.update_spinning_widget->isHidden()) - return; - current_state = State::Waiting; spinning_animation->stopOnMainWidgets(m_ui.installation_spinning_label, - m_ui.remove_spinning_label, - m_ui.update_spinning_label); + m_ui.remove_spinning_label); } } @@ -411,9 +352,9 @@ void MainWindowView::showSingleAnimation(Process::Task task) (Process::Task::Update == task)) { m_ui.packages_to_update_label->setText(i18n("TO UPDATE")); - m_ui.update_packages_button->setDisabled(true); + blockUpdateColumn(); m_ui.update_spinning_widget->show(); - m_ui.packages_to_update_list->hide(); + m_ui.check_updates_button->setDisabled(true); spinning_animation->startOnWidget<2>(m_ui.update_spinning_label); } @@ -437,6 +378,12 @@ void MainWindowView::showSingleAnimation(Process::Task task) } +void MainWindowView::setRunningState() +{ + current_state = State::Running; +} + + void MainWindowView::generatePreview(Process::Task task) { QString task_text = QVariant::fromValue(task).toString().toLower(); @@ -571,10 +518,11 @@ void MainWindowView::finishProcess(Process::Task task, int exit_code, QProcess:: Q_UNUSED(exit_code) Q_UNUSED(exit_status) + const bool is_update_task = task == Process::Task::Update || task == Process::Task::UpdateAll; + if (task != Process::Task::Install && - task != Process::Task::Update && task != Process::Task::Uninstall && - task != Process::Task::UpdateAll) + !is_update_task) { progress_view.data()->removeProgressView(generated_previews_map.value(task)); generated_previews_map.remove(task); @@ -586,9 +534,15 @@ void MainWindowView::finishProcess(Process::Task task, int exit_code, QProcess:: } } + if (is_update_task) + m_ui.update_packages_button->setDisabled(false); + Process::resetRunningTask(task); current_state = State::Waiting; refresh(); + + if (is_update_task) + checkUpdates(); } @@ -596,8 +550,13 @@ void MainWindowView::checkUpdates() { Logger::logger()->logInfo(QStringLiteral("Start check updates - %1").arg(QDateTime::currentDateTime().toString())); + updated_packages_column->clear(); blockUpdateColumn(); + m_ui.update_spinning_label->setText(""); + spinning_animation->startOnWidget<3>(m_ui.update_spinning_label); + m_ui.check_updates_button->setDisabled(true); main_window_view_signals->attachCheckUpdates(); + emit updateCheckInitialized(); } @@ -632,19 +591,19 @@ bool MainWindowView::isRunningMainThreads() void MainWindowView::blockUpdateColumn() { m_ui.update_spinning_widget->show(); - spinning_animation->startOnWidget<2>(m_ui.update_spinning_label); m_ui.packages_to_update_list->hide(); + m_ui.updated_preview_area->hide(); m_ui.search_packages_to_update_checkbox->setCheckState(Qt::Unchecked); - m_ui.search_packages_to_update_checkbox->setEnabled(false); + m_ui.search_packages_to_update_checkbox->setDisabled(true); m_ui.check_all_updates_checkbox->setCheckState(Qt::Unchecked); - m_ui.check_all_updates_checkbox->setEnabled(false); + m_ui.check_all_updates_checkbox->setDisabled(true); m_ui.sort_packages_to_update->setCheckState(Qt::Unchecked); m_ui.sort_packages_to_update->hide(); m_ui.search_packages_to_update_lineedit->clear(); m_ui.search_packages_to_update_lineedit->hide(); - m_ui.update_packages_button->setEnabled(false); - m_ui.sort_packages_to_update->setEnabled(false); - m_ui.search_packages_to_update_lineedit->setEnabled(false); + m_ui.update_packages_button->setDisabled(true); + m_ui.sort_packages_to_update->setDisabled(true); + m_ui.search_packages_to_update_lineedit->setDisabled(true); } @@ -662,9 +621,12 @@ void MainWindowView::refresh() return; } + available_packages_column->clear(); + installed_packages_column->clear(); current_state = State::Running; disconnectSortSignals(); - hideWidgets(); + blockInstallationColumn(); + blockAvailableColumn(); emit initStarted(); startAnimations(); @@ -673,14 +635,6 @@ void MainWindowView::refresh() } -void MainWindowView::setForcedUpdateFlag() -{ - // for tooltips update - available_packages_column->setForcedUpdateFlag(); - installed_packages_column->setForcedUpdateFlag(); -} - - void MainWindowView::startAnimations() { m_ui.packages_to_update_label->setText(i18n("TO UPDATE")); @@ -689,9 +643,7 @@ void MainWindowView::startAnimations() m_ui.remove_spinning_widget->show(); m_ui.installation_spinning_widget->show(); - m_ui.update_spinning_widget->show(); spinning_animation->startOnMainWidgets(m_ui.installation_spinning_label, - m_ui.remove_spinning_label, - m_ui.update_spinning_label); + m_ui.remove_spinning_label); } diff --git a/src/src/mainwindowview.h b/src/src/mainwindowview.h index a4e3cbe..daf5124 100644 --- a/src/src/mainwindowview.h +++ b/src/src/mainwindowview.h @@ -68,10 +68,10 @@ class MainWindowView : public QWidget public Q_SLOTS: void refresh(); - void setForcedUpdateFlag(); void showInputWidgets(Process::Task task); void generatePreview(Process::Task task); void showSingleAnimation(Process::Task task); + void setRunningState(); void generateOutput(Process::Task task, const QString& line); virtual void showStatisticsWindow(); virtual void downloadPackage(); @@ -85,11 +85,10 @@ public Q_SLOTS: private Q_SLOTS: void startAnimations(); - void connectSignalsForAvailablePackages(); - void connectSignalsForInstalledPackages(); - void connectSignalsForUpdatedPackages(); + void updateWidgetsForAvailablePackages(); + void updateWidgetsForInstalledPackages(); + void updateWidgetsForUpdatedPackages(); void toggleWidgetsAccess(bool is_online); - void abortProcessFromButton(QProcess* process, QPushButton* button); signals: void operationsAmountIncreased(); @@ -100,6 +99,7 @@ private Q_SLOTS: void packagesToUpdateFillEnded(); void hideOnlineActions(); void packagesToUpdateCountChanged(uint packages_count); + void updateCheckInitialized(); protected: Ui::MainWindowView m_ui; @@ -113,15 +113,15 @@ private Q_SLOTS: virtual void showFinishInformation(); virtual void updatePreviewsDesign(); + void showUpdatedPackagesWidgets(); private: void addInputWidgets(QVBoxLayout*& vbox_layout, QWidget*& scroll_area_widget_contents, const QString& text); - void hideWidgets(); - void hideWidgetsExceptInstalled(); + void blockInstallationColumn(); + void blockAvailableColumn(); void checkSpinningVisibility(); - void clearMainPreviews(Process::Task task); void disconnectSortSignals(); void reconnectSortSignals(); diff --git a/src/src/mainwindowview.ui b/src/src/mainwindowview.ui index e7ed4f2..e12aabb 100644 --- a/src/src/mainwindowview.ui +++ b/src/src/mainwindowview.ui @@ -121,7 +121,7 @@ 0 - -75 + 0 429 766 @@ -759,6 +759,30 @@ padding: 3px; + + + + Check + + + + :/icons/updated-packages.png:/icons/updated-packages.png + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/src/mainwindowviewsignals.cpp b/src/src/mainwindowviewsignals.cpp index b411763..d40966d 100644 --- a/src/src/mainwindowviewsignals.cpp +++ b/src/src/mainwindowviewsignals.cpp @@ -25,8 +25,8 @@ #include -MainWindowViewSignals::MainWindowViewSignals(MainWindowView* main_window_view) : - main_window_view{main_window_view} +MainWindowViewSignals::MainWindowViewSignals(MainWindowView* new_main_window_view) : + main_window_view{new_main_window_view} { // ... } @@ -93,9 +93,9 @@ void MainWindowViewSignals::startInternetCheckTimer() void MainWindowViewSignals::attachConnectSignalsAfterFillEnd() { - QObject::connect(main_window_view, &MainWindowView::availablePackagesFillEnded, main_window_view, &MainWindowView::connectSignalsForAvailablePackages); - QObject::connect(main_window_view, &MainWindowView::installedPackagesFillEnded, main_window_view, &MainWindowView::connectSignalsForInstalledPackages); - QObject::connect(main_window_view, &MainWindowView::packagesToUpdateFillEnded, main_window_view, &MainWindowView::connectSignalsForUpdatedPackages); + QObject::connect(main_window_view, &MainWindowView::availablePackagesFillEnded, main_window_view, &MainWindowView::updateWidgetsForAvailablePackages); + QObject::connect(main_window_view, &MainWindowView::installedPackagesFillEnded, main_window_view, &MainWindowView::updateWidgetsForInstalledPackages); + QObject::connect(main_window_view, &MainWindowView::packagesToUpdateFillEnded, main_window_view, &MainWindowView::updateWidgetsForUpdatedPackages); } @@ -140,6 +140,7 @@ void MainWindowViewSignals::attachSignalsForProcess() QObject::connect(main_window_view->process.data(), &Process::showInput, main_window_view, &MainWindowView::showInputWidgets); QObject::connect(main_window_view->process.data(), &Process::acceptedMainTask, main_window_view, &MainWindowView::showSingleAnimation, Qt::AutoConnection); + QObject::connect(main_window_view->process.data(), &Process::acceptedMainTask, main_window_view, &MainWindowView::setRunningState, Qt::AutoConnection); QObject::connect(main_window_view->process.data(), &Process::generatedOutput, main_window_view, &MainWindowView::generateOutput, Qt::AutoConnection); QObject::connect(main_window_view->process.data(), &Process::acceptedTask, main_window_view, &MainWindowView::generatePreview); @@ -202,9 +203,11 @@ void MainWindowViewSignals::attachInstalledPackagesColumn() void MainWindowViewSignals::attachPackagesToUpdateColumn() { + QObject::connect(main_window_view, &MainWindowView::updateCheckInitialized, main_window_view->process.get(), &Process::setFirstUpdateInitializationFlag); QObject::connect(main_window_view->m_ui.sort_packages_to_update, &QCheckBox::toggled, main_window_view->updated_packages_column.data(), &UpdatedPackagesColumn::sort, Qt::AutoConnection); QObject::connect(main_window_view->updated_packages_column.data(), &UpdatedPackagesColumn::checkedPackagesCounterChanged, this, [this](bool has_checked_buttons) { main_window_view->m_ui.update_packages_button->setEnabled(has_checked_buttons); }, Qt::AutoConnection); - QObject::connect(main_window_view->m_ui.update_packages_button, &QPushButton::clicked, this, [this]() { main_window_view->updated_packages_column.data()->prepareBeforeProcessRun(); }, Qt::AutoConnection); + QObject::connect(main_window_view->m_ui.update_packages_button, &QPushButton::clicked, this, [&]() { main_window_view->updated_packages_column.data()->prepareBeforeProcessRun(); }, Qt::AutoConnection); + QObject::connect(main_window_view->m_ui.check_updates_button, &QPushButton::clicked, this, [&](){ main_window_view->checkUpdates(); }, Qt::AutoConnection); QObject::connect(main_window_view->updated_packages_column.data(), &UpdatedPackagesColumn::preparedList, [&](QStringList packages_list, Process::Task task, uint aur_checked_packages) { @@ -214,7 +217,7 @@ void MainWindowViewSignals::attachPackagesToUpdateColumn() main_window_view->m_ui.text_browser_tab_update->clear(); if (main_window_view->process->preparedBeforeRun(task, packages_list)) { - main_window_view->installed_packages_column->setForcedUpdateFlag(); + main_window_view->m_ui.update_packages_button->setDisabled(true); main_window_view->process->run(task, packages_list); } }); @@ -222,7 +225,8 @@ void MainWindowViewSignals::attachPackagesToUpdateColumn() QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsRemoved, this, [this](){ if (main_window_view->m_ui.packages_to_update_list->count() == 0) main_window_view->m_ui.update_packages_button->setEnabled(false); }, Qt::AutoConnection); QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsInserted, this, [this](){ main_window_view->m_ui.search_packages_to_update_checkbox->setEnabled(true); }, Qt::AutoConnection); QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsRemoved, this, [this](){ if (main_window_view->m_ui.packages_to_update_list->count() == 0) main_window_view->m_ui.search_packages_to_update_checkbox->setEnabled(false); }, Qt::AutoConnection); - QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsInserted, this, [this](){ main_window_view->m_ui.check_all_updates_checkbox->setEnabled(true); }, Qt::AutoConnection); + QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsInserted, this, [this](){ + main_window_view->m_ui.check_all_updates_checkbox->setEnabled(true); }, Qt::AutoConnection); QObject::connect(main_window_view->m_ui.packages_to_update_list->model(), &QAbstractListModel::rowsRemoved, this, [this](){ if (main_window_view->m_ui.packages_to_update_list->count() == 0) main_window_view->m_ui.check_all_updates_checkbox->setEnabled(false); }, Qt::AutoConnection); QObject::connect(main_window_view->m_ui.search_packages_to_update_checkbox, &QCheckBox::clicked, this, [this](bool checked) diff --git a/src/src/mainwindowviewsignals.h b/src/src/mainwindowviewsignals.h index dadbf83..b469231 100644 --- a/src/src/mainwindowviewsignals.h +++ b/src/src/mainwindowviewsignals.h @@ -28,7 +28,7 @@ class MainWindowViewSignals : public QObject Q_OBJECT public: - explicit MainWindowViewSignals(MainWindowView* main_window_view); + explicit MainWindowViewSignals(MainWindowView* new_main_window_view); ~MainWindowViewSignals() override; void attachInputAnswerLines(); diff --git a/src/src/packagescolumn.cpp b/src/src/packagescolumn.cpp index 4426030..4a3f827 100644 --- a/src/src/packagescolumn.cpp +++ b/src/src/packagescolumn.cpp @@ -22,7 +22,7 @@ #include - +bool PackagesColumn::is_condition_needed = false; QWaitCondition PackagesColumn::condition; PackagesColumn::PackagesColumn(QListWidget* new_list_widget, @@ -74,20 +74,20 @@ uint PackagesColumn::getAurPackagesCount() const QStringList PackagesColumn::getCheckedPackagesStringList() { - QStringList checked_packages; + QStringList checked_packages_temp; decltype(checked_packages_list)::iterator it; for (it = checked_packages_list.begin(); it != checked_packages_list.end(); ++it) { if (!(*it)) { - std::erase(checked_packages_list, (*it)); + checked_packages_list.erase(std::remove(checked_packages_list.begin(), checked_packages_list.end(), (*it)), checked_packages_list.end()); continue; } - checked_packages.append((*it)->getName()); + checked_packages_temp.append((*it)->getName()); } - return checked_packages; + return checked_packages_temp; } @@ -162,19 +162,7 @@ void PackagesColumn::removeUncheckedPackage(Package* package) aur_checked_packages--; Logger::logger()->logDebug(QStringLiteral("Removed package from list: %1").arg(package->getName())); - std::erase(checked_packages_list, package); -} - - -bool PackagesColumn::isColumnNotChanged(const QString& log_column_text, const QStringList& packages_list) -{ - if (packages_list.count() == list_widget->count()) - { - Logger::logger()->logInfo(QStringLiteral("%1 packages column has not been changed - %2 packages.").arg(log_column_text).arg(list_widget->count())); - return true; - } - - return false; + checked_packages_list.erase(std::remove(checked_packages_list.begin(), checked_packages_list.end(), package), checked_packages_list.end()); } diff --git a/src/src/packagescolumn.h b/src/src/packagescolumn.h index 1089e0a..f5887cc 100644 --- a/src/src/packagescolumn.h +++ b/src/src/packagescolumn.h @@ -64,7 +64,6 @@ public Q_SLOTS: protected: void addCheckedPackage(Package* package); void removeUncheckedPackage(Package* package); - bool isColumnNotChanged(const QString& log_column_text, const QStringList& packages_list); uint getWaitTime(); int checked_packages; @@ -75,5 +74,6 @@ public Q_SLOTS: QWidget* parent; std::deque checked_packages_list; static QWaitCondition condition; + static bool is_condition_needed; }; diff --git a/src/src/process.cpp b/src/src/process.cpp index 45e9a65..a539317 100644 --- a/src/src/process.cpp +++ b/src/src/process.cpp @@ -166,6 +166,12 @@ void Process::inputAnswer(const QString& new_answer, Process::Task task) } +void Process::setFirstUpdateInitializationFlag() +{ + was_update_initialized = true; +} + + void Process::setPackagesToUpdate(uint packages_to_update_count) { packages_to_update = packages_to_update_count; @@ -351,7 +357,7 @@ bool Process::isNeededAskAboutUpdate(Task new_task) if (Settings::records()->operateOnActionsManually()) return false; - if (new_task == Task::Install) + if (new_task == Task::Install && was_update_initialized) return true; return false; diff --git a/src/src/process.h b/src/src/process.h index 488d862..f3b148a 100644 --- a/src/src/process.h +++ b/src/src/process.h @@ -76,6 +76,7 @@ private Q_SLOTS: public Q_SLOTS: void inputAnswer(const QString& new_answer, Process::Task task); + void setFirstUpdateInitializationFlag(); signals: void finished(Process::Task task, int exit_code, QProcess::ExitStatus exit_status); @@ -112,6 +113,7 @@ public Q_SLOTS: QSharedPointer current_process; uint packages_to_update = 0; uint aur_packages_to_update_count = 0; + bool was_update_initialized = false; QWidget* parent; std::once_flag yes_no_commands_update; }; diff --git a/src/src/rc.cpp b/src/src/rc.cpp index 4cdff5e..4db3670 100644 --- a/src/src/rc.cpp +++ b/src/src/rc.cpp @@ -382,3 +382,204 @@ i18n("Form"); // i18n: file: src/src/appstylesettings.ui:60 // i18n: ectx: property (text), widget (QLabel, styles_text) i18n("Application style"); +// i18n: file: src/src/mainwindowview.ui:95 +// i18n: ectx: property (text), widget (QCheckBox, progress_view_checkbox) +i18n("View progress"); +// i18n: file: src/src/mainwindowview.ui:184 +// i18n: ectx: property (text), widget (QLabel, installed_packages_label) +i18n("INSTALLED"); +// i18n: file: src/src/mainwindowview.ui:229 +// i18n: ectx: property (text), widget (QCheckBox, sort_installed_packages) +i18n("Reverse sorting"); +// i18n: file: src/src/mainwindowview.ui:355 +// i18n: ectx: property (text), widget (QPushButton, input_for_uninstall_btn) +i18n("Input"); +// i18n: file: src/src/mainwindowview.ui:403 +// i18n: ectx: property (text), widget (QPushButton, uninstall_packages_button) +i18n("Uninstall"); +// i18n: file: src/src/mainwindowview.ui:446 +// i18n: ectx: property (text), widget (QCheckBox, console_view_uninstall) +i18n("Preview"); +// i18n: file: src/src/mainwindowview.ui:460 +// i18n: ectx: property (text), widget (QCheckBox, search_installed_packages_checkbox) +i18n("Search"); +// i18n: file: src/src/mainwindowview.ui:543 +// i18n: ectx: property (text), widget (QLabel, packages_to_update_label) +i18n("TO UPDATE"); +// i18n: file: src/src/mainwindowview.ui:588 +// i18n: ectx: property (text), widget (QCheckBox, sort_packages_to_update) +i18n("Reverse sorting"); +// i18n: file: src/src/mainwindowview.ui:720 +// i18n: ectx: property (text), widget (QPushButton, input_for_update_btn) +i18n("Input"); +// i18n: file: src/src/mainwindowview.ui:765 +// i18n: ectx: property (text), widget (QPushButton, check_updates_button) +i18n("Check"); +// i18n: file: src/src/mainwindowview.ui:792 +// i18n: ectx: property (text), widget (QPushButton, update_packages_button) +i18n("Update"); +// i18n: file: src/src/mainwindowview.ui:835 +// i18n: ectx: property (text), widget (QCheckBox, console_view_update) +i18n("Preview"); +// i18n: file: src/src/mainwindowview.ui:849 +// i18n: ectx: property (text), widget (QCheckBox, search_packages_to_update_checkbox) +i18n("Search"); +// i18n: file: src/src/mainwindowview.ui:863 +// i18n: ectx: property (text), widget (QCheckBox, check_all_updates_checkbox) +i18n("Check all"); +// i18n: file: src/src/mainwindowview.ui:946 +// i18n: ectx: property (text), widget (QLabel, accessible_packages) +i18n("AVAILABLE TO INSTALL"); +// i18n: file: src/src/mainwindowview.ui:991 +// i18n: ectx: property (text), widget (QCheckBox, sort_available_packages) +i18n("Reverse sorting"); +// i18n: file: src/src/mainwindowview.ui:1117 +// i18n: ectx: property (text), widget (QPushButton, input_for_install_btn) +i18n("Input"); +// i18n: file: src/src/mainwindowview.ui:1165 +// i18n: ectx: property (text), widget (QPushButton, install_packages_button) +i18n("Install"); +// i18n: file: src/src/mainwindowview.ui:1208 +// i18n: ectx: property (text), widget (QCheckBox, console_view_install) +i18n("Preview"); +// i18n: file: src/src/mainwindowview.ui:1222 +// i18n: ectx: property (text), widget (QCheckBox, search_available_packages_checkbox) +i18n("Search"); +// i18n: file: src/src/mainwindowview.ui:1261 +// i18n: ectx: property (toolTip), widget (QLabel, repo_led_label) +i18n("Internet connection state"); +// i18n: file: src/src/mainwindowview.ui:1264 +// i18n: ectx: property (text), widget (QLabel, repo_led_label) +i18n("Repositories"); +// i18n: file: src/src/mainwindowview.ui:1274 +// i18n: ectx: property (toolTip), widget (QLabel, aur_led_label) +i18n("Internet connection state and auracle-git package presence"); +// i18n: file: src/src/mainwindowview.ui:1277 +// i18n: ectx: property (text), widget (QLabel, aur_led_label) +i18n("AUR"); +// i18n: file: src/src/mainwindowview.ui:1287 +// i18n: ectx: property (toolTip), widget (QLabel, polaur_led_label) +i18n("Internet connection state and git package presence"); +// i18n: file: src/src/mainwindowview.ui:1290 +// i18n: ectx: property (text), widget (QLabel, polaur_led_label) +i18n("POLAUR"); +// i18n: file: src/src/progressview.ui:14 +// i18n: ectx: property (windowTitle), widget (QDialog, ProgressView) +i18n("Side actions"); +// i18n: file: src/src/progressview.ui:28 +// i18n: ectx: attribute (title), widget (QWidget, tab1) +i18n("Tab 1"); +// i18n: file: src/src/progressview.ui:57 +// i18n: ectx: attribute (title), widget (QWidget, tab2) +i18n("Tab 2"); +// i18n: file: src/src/previewsappearancesettings.ui:14 +// i18n: ectx: property (windowTitle), widget (QWidget, PreviewsAppearanceSettings) +i18n("Form"); +// i18n: file: src/src/previewsappearancesettings.ui:41 +// i18n: ectx: property (text), widget (QLabel, label) +i18n("background color "); +// i18n: file: src/src/previewsappearancesettings.ui:57 +// i18n: ectx: property (text), widget (QLabel, label_2) +i18n("font color"); +// i18n: file: src/src/previewsappearancesettings.ui:71 +// i18n: ectx: property (text), widget (QLabel, label_3) +i18n("font family"); +// i18n: file: src/src/previewsappearancesettings.ui:98 +// i18n: ectx: property (text), widget (QLabel, label_4) +i18n("font size "); +// i18n: file: src/src/logssettings.ui:14 +// i18n: ectx: property (windowTitle), widget (QWidget, LogsSettings) +i18n("Form"); +// i18n: file: src/src/logssettings.ui:39 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_save_logs_into_file) +i18n("Save logs into file"); +// i18n: file: src/src/logssettings.ui:49 +// i18n: ectx: property (text), widget (QLabel, label) +i18n("in path"); +// i18n: file: src/src/logssettings.ui:67 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_show_debug) +i18n("show debug"); +// i18n: file: src/src/logssettings.ui:74 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_hide_info_logs) +i18n("hide information logs"); +// i18n: file: src/src/packageinput.ui:14 +// i18n: ectx: property (windowTitle), widget (QWidget, PackageInputWindow) +i18n("Form"); +// i18n: file: src/src/packageinput.ui:38 +// i18n: ectx: property (text), widget (QLabel, label) +i18n("Enter the package name"); +// i18n: file: src/src/pak-gui.rc:10 +// i18n: ectx: Menu (Program) +i18n("P&rogram"); +// i18n: file: src/src/pak-gui.rc:14 +// i18n: ectx: Menu (Actions) +i18n("A&ctions"); +// i18n: file: src/src/pak-gui.rc:25 +// i18n: ectx: Menu (Print) +i18n("P&rint"); +// i18n: file: src/src/pak-gui.rc:29 +// i18n: ectx: Menu (Settings) +i18n("S&ettings"); +// i18n: file: src/src/pak-gui.rc:38 +// i18n: ectx: ToolBar (mainToolBar) +i18n("Main Toolbar"); +// i18n: file: src/src/packagesinfosettings.ui:14 +// i18n: ectx: property (windowTitle), widget (QWidget, PackagesInfoSettings) +i18n("Form"); +// i18n: file: src/src/generalsettings.ui:48 +// i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_days_label) +i18n("day(s)"); +// i18n: file: src/src/generalsettings.ui:55 +// i18n: ectx: property (text), widget (QLabel, check_packages_for_update_label) +i18n("Check packages ready to update every "); +// i18n: file: src/src/generalsettings.ui:65 +// i18n: ectx: property (text), widget (QLabel, internet_reconnection_label) +i18n("Try to reconnect to the internet every "); +// i18n: file: src/src/generalsettings.ui:75 +// i18n: ectx: property (text), widget (QLabel, store_operations_history_days_label) +i18n("day(s)"); +// i18n: file: src/src/generalsettings.ui:82 +// i18n: ectx: property (text), widget (QLabel, internet_reconnection_minutes_label) +i18n("minute(s)"); +// i18n: file: src/src/generalsettings.ui:92 +// i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_minutes_label) +i18n("minute(s)"); +// i18n: file: src/src/generalsettings.ui:99 +// i18n: ectx: property (text), widget (QLabel, check_packages_for_updates_hours_label) +i18n("hour(s)"); +// i18n: file: src/src/generalsettings.ui:106 +// i18n: ectx: property (text), widget (QLabel, store_operations_history_label) +i18n("Store operations history for "); +// i18n: file: src/src/generalsettings.ui:116 +// i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_label) +i18n("Set limit of single operations history size to "); +// i18n: file: src/src/generalsettings.ui:129 +// i18n: ectx: property (text), widget (QLabel, set_single_operations_history_limit_mb_label) +i18n("MB"); +// i18n: file: src/src/generalsettings.ui:156 +// i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manual_operations_checkbox) +i18n("If checked, any action needs answer from user within preview"); +// i18n: file: src/src/generalsettings.ui:159 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_manual_operations_checkbox) +i18n("Operate on actions manually"); +// i18n: file: src/src/generalsettings.ui:166 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_overwrite_full_history_file) +i18n("Overwrite operations history file (when full size)"); +// i18n: file: src/src/generalsettings.ui:173 +// i18n: ectx: property (text), widget (QCheckBox, kcfg_use_system_tray_icon) +i18n("Use system tray icon"); +// i18n: file: src/src/choicewindow.ui:14 +// i18n: ectx: property (windowTitle), widget (QDialog, ChoiceWindow) +i18n("Dialog"); +// i18n: file: src/src/choicewindow.ui:40 +// i18n: ectx: property (text), widget (QLabel, choice_label) +i18n("Choose path for package save"); +// i18n: file: src/src/choicewindow.ui:533 +// i18n: ectx: property (text), widget (QLabel, no_results_label) +i18n("No results"); +// i18n: file: src/src/appstylesettings.ui:14 +// i18n: ectx: property (windowTitle), widget (QWidget, AppStyleSettings) +i18n("Form"); +// i18n: file: src/src/appstylesettings.ui:60 +// i18n: ectx: property (text), widget (QLabel, styles_text) +i18n("Application style"); diff --git a/src/src/settings.cpp b/src/src/settings.cpp index 6003450..f39aa9a 100644 --- a/src/src/settings.cpp +++ b/src/src/settings.cpp @@ -33,9 +33,9 @@ QScopedPointer Settings::settings_records(nullptr); -Settings::Settings(MainWindow* main_window) : - KConfigDialog(main_window, QStringLiteral("settings"), pakGuiSettings::self()), - main_window(main_window) +Settings::Settings(MainWindow* new_main_window) : + KConfigDialog(new_main_window, QStringLiteral("settings"), pakGuiSettings::self()), + main_window(new_main_window) { init(main_window); connectSignals(main_window); @@ -120,7 +120,7 @@ void Settings::updateSettings() } -void Settings::init(MainWindow* main_window) +void Settings::init(MainWindow* new_main_window) { QPointer general_page = new QWidget; general_settings.setupUi(general_page); @@ -137,15 +137,14 @@ void Settings::init(MainWindow* main_window) addPage(packages_info_page, i18nc("@title:tab", "Packages informations"), QStringLiteral(":/icons/package-info-settings.png")); addPage(logs_page, i18nc("@title:tab", "Logs"), QStringLiteral(":/icons/logs-settings.png")); addPage(styles_page, i18nc("@title:tab", "Styles"), QStringLiteral(":/icons/styles-settings.png")); - connect(this, &Settings::settingsChanged, main_window, &MainWindow::startSystemTray); - connect(this, &Settings::settingsChanged, main_window, &MainWindow::setTimersOnChecks); + connect(this, &Settings::settingsChanged, new_main_window, &MainWindow::startSystemTray); + connect(this, &Settings::settingsChanged, new_main_window, &MainWindow::setTimersOnChecks); - QString first_style = QStyleFactory::keys().first(); styles_settings.app_style_name_combobox->addItems(QStyleFactory::keys()); styles_settings.app_style_name_combobox->setCurrentText(records()->appStyleName()); if (records()->appStyleName().isEmpty()) - styles_settings.app_style_name_combobox->setCurrentText(QStyleFactory::keys().first()); + styles_settings.app_style_name_combobox->setCurrentText(QStyleFactory::keys().constFirst()); setAttribute(Qt::WA_DeleteOnClose); } @@ -164,9 +163,9 @@ void Settings::loadPackagesInfoSettings() } -void Settings::connectSignals(MainWindow* main_window) +void Settings::connectSignals(MainWindow* new_main_window) { - connect(records().get(), &SettingsRecords::selectedPackageInfoListChanged, [main_window]() { emit main_window->updatedPackageInfoList(); }); + connect(records().get(), &SettingsRecords::selectedPackageInfoListChanged, [new_main_window]() { emit new_main_window->updatedPackageInfoList(); }); if (!packages_info_settings.packages_info_selector) return; diff --git a/src/src/settings.h b/src/src/settings.h index c054760..066a1b2 100644 --- a/src/src/settings.h +++ b/src/src/settings.h @@ -38,7 +38,7 @@ class Settings : public KConfigDialog Q_OBJECT public: - explicit Settings(MainWindow* main_window); + explicit Settings(MainWindow* new_main_window); ~Settings() override; static void saveInitDateTimesWhenEmpty(); @@ -64,8 +64,8 @@ protected Q_SLOTS: MainWindow* main_window = nullptr; private: - void init(MainWindow* main_window); - void connectSignals(MainWindow* main_window); + void init(MainWindow* new_main_window); + void connectSignals(MainWindow* new_main_window); void enableButtons(); void updateAvailableInfoList(); void updateSelectedInfoList(); diff --git a/src/src/spinninganimation.cpp b/src/src/spinninganimation.cpp index 2fd2d1f..f45a451 100644 --- a/src/src/spinninganimation.cpp +++ b/src/src/spinninganimation.cpp @@ -32,8 +32,7 @@ SpinningAnimation::SpinningAnimation() : void SpinningAnimation::startOnMainWidgets(const QPointer& first_label, - const QPointer& second_label, - const QPointer& third_label) + const QPointer& second_label) { if (!isValid(animation)) return; @@ -42,26 +41,21 @@ void SpinningAnimation::startOnMainWidgets(const QPointer& first_label, first_label->show(); restartMovie(second_label, animation2); second_label->show(); - restartMovie(third_label, animation3); - third_label->show(); Logger::logger()->logDebug(QStringLiteral("Main animation started!")); } void SpinningAnimation::stopOnMainWidgets(const QPointer& first_label, - const QPointer& second_label, - const QPointer& third_label) + const QPointer& second_label) { if (!isValid(animation)) return; first_label->hide(); second_label->hide(); - third_label->hide(); animation->stop(); animation2->stop(); - animation3->stop(); Logger::logger()->logDebug(QStringLiteral("Main animations stopped!")); } @@ -166,9 +160,9 @@ void SpinningAnimation::stopSmallOnWidget(const QPointer& label) } -bool SpinningAnimation::isValid(const QScopedPointer& animation) +bool SpinningAnimation::isValid(const QScopedPointer& new_animation) { - if (animation.isNull()) + if (new_animation.isNull()) { Logger::logger()->logDebug("Cannot toggle animation - animation instance doesn't exist"); return false; @@ -179,11 +173,11 @@ bool SpinningAnimation::isValid(const QScopedPointer& animation) void SpinningAnimation::restartMovie(const QPointer& label, - const QScopedPointer& animation) + const QScopedPointer& new_animation) { if (!label->movie()) { - label->setMovie(animation.get()); + label->setMovie(new_animation.get()); label->movie()->start(); return; } diff --git a/src/src/spinninganimation.h b/src/src/spinninganimation.h index 3e1f01c..c727425 100644 --- a/src/src/spinninganimation.h +++ b/src/src/spinninganimation.h @@ -32,11 +32,9 @@ class SpinningAnimation template void startOnWidget(const QPointer& label); template void stopOnWidget(const QPointer& label); void startOnMainWidgets(const QPointer& first_label, - const QPointer& second_label, - const QPointer& third_label); + const QPointer& second_label); void stopOnMainWidgets(const QPointer& first_label, - const QPointer& second_label, - const QPointer& third_label); + const QPointer& second_label); bool isAnimationRunning() const; bool isSmallAnimationRunning() const; @@ -45,9 +43,9 @@ public Q_SLOTS: void stopSmallOnWidget(const QPointer& label); private: - bool isValid(const QScopedPointer& animation); + bool isValid(const QScopedPointer& new_animation); void restartMovie(const QPointer& first_label, - const QScopedPointer& animation); + const QScopedPointer& new_animation); QScopedPointer animation; QScopedPointer animation2; diff --git a/src/src/updatedpackagescolumn.cpp b/src/src/updatedpackagescolumn.cpp index 0ea6580..2413a0a 100644 --- a/src/src/updatedpackagescolumn.cpp +++ b/src/src/updatedpackagescolumn.cpp @@ -63,7 +63,21 @@ QHash UpdatedPackagesColumn::getPackagesList() void UpdatedPackagesColumn::fill() { + bool was_condition_needed = is_condition_needed; + is_condition_needed = true; mutex.lock(); + +#ifdef RUN_TESTS + if (was_condition_needed) + { + QDeadlineTimer deadline(getWaitTime()); + condition.wait(&mutex, deadline); + } +#else + if (was_condition_needed) + condition.wait(&mutex); +#endif + not_repo_packages_count = 0; packages_sorter->resetOriginalList(); Q_ASSERT(packages_sorter->isOriginalListEmpty()); @@ -71,7 +85,8 @@ void UpdatedPackagesColumn::fill() Q_ASSERT(list_widget->count() == 0); const auto& pak_packages = getPackagesList(); updatePackagesCount(pak_packages.count()); - wakeUpOtherColumns(); + if (!was_condition_needed) + wakeUpOtherColumns(); QHash::const_iterator it = pak_packages.cbegin(); int i = 0; @@ -101,6 +116,7 @@ void UpdatedPackagesColumn::fill() Logger::logger()->logInfo(QStringLiteral("Filled column with %1 packages to update").arg(list_widget->count())); list_widget->update(); mutex.unlock(); + is_condition_needed = false; } diff --git a/tests/gui/downloadcommandparsertest.cpp b/tests/gui/downloadcommandparsertest.cpp index d7bf251..57de16f 100644 --- a/tests/gui/downloadcommandparsertest.cpp +++ b/tests/gui/downloadcommandparsertest.cpp @@ -50,9 +50,10 @@ void MockDownloadCommandParser::connectSignals() } -bool MockDownloadCommandParser::validateFinishedOutput(int exit_code) +bool MockDownloadCommandParser::validateFinishedOutput(int exit_code, QProcess::ExitStatus exit_status) { Q_UNUSED(exit_code) + Q_UNUSED(exit_status) return isPackageAlreadyDownloaded(); } diff --git a/tests/gui/downloadcommandparsertest.h b/tests/gui/downloadcommandparsertest.h index 3f9d5ab..084c6a6 100644 --- a/tests/gui/downloadcommandparsertest.h +++ b/tests/gui/downloadcommandparsertest.h @@ -41,7 +41,7 @@ class MockDownloadCommandParser : public DownloadCommandParser void connectSignals() override; protected Q_SLOTS: - bool validateFinishedOutput(int exit_code) override; + bool validateFinishedOutput(int exit_code, QProcess::ExitStatus exit_status) override; }; diff --git a/tests/gui/packagestoupdatecolumntest.cpp b/tests/gui/packagestoupdatecolumntest.cpp index 94deea5..411cd84 100644 --- a/tests/gui/packagestoupdatecolumntest.cpp +++ b/tests/gui/packagestoupdatecolumntest.cpp @@ -61,6 +61,13 @@ TestUpdatedPackagesColumn::TestUpdatedPackagesColumn(QObject* parent) : } +void TestUpdatedPackagesColumn::isOnStartVisiblePressCheckButtonLabelWithProperStyle() +{ + QCOMPARE(main_window_view.m_ui.update_spinning_label->text(), i18n("Press \"Check\" button")); + QCOMPARE(main_window_view.m_ui.update_spinning_label->styleSheet(), "color: black; font-size: 15px;"); +} + + void TestUpdatedPackagesColumn::updatedColumnLabelHasProperContent() { QCOMPARE(main_window_view.m_ui.packages_to_update_label->text(), i18n("TO UPDATE")); @@ -78,8 +85,9 @@ void TestUpdatedPackagesColumn::showUpdatedColumnPreview() void TestUpdatedPackagesColumn::hideUpdatedColumnPreview() { QTest::mouseClick(&*main_window_view.m_ui.console_view_update, Qt::LeftButton); + qDebug() << "First click on console view update checkbox: " << main_window_view.m_ui.console_view_update->checkState(); QTest::mouseClick(&*main_window_view.m_ui.console_view_update, Qt::LeftButton); - qDebug() << main_window_view.m_ui.console_view_update->checkState(); + qDebug() << "Second click on console view update checkbox: " << main_window_view.m_ui.console_view_update->checkState(); QVERIFY(main_window_view.m_ui.updated_preview_area->isHidden()); } @@ -198,6 +206,7 @@ void TestUpdatedPackagesColumn::packagesOrderIsReversedAfterButtonCheck() disconnect(main_window_view.m_ui.sort_packages_to_update, &QCheckBox::toggled, main_window_view.updated_packages_column.data(), &UpdatedPackagesColumn::sort); connect(main_window_view.m_ui.sort_packages_to_update, &QCheckBox::toggled, column.data(), &MockUpdatedPackagesColumn::sort); column->fill(); + main_window_view.showUpdatedPackagesWidgets(); auto first_package_before_sort = dynamic_cast(main_window_view.m_ui.packages_to_update_list->findItems("*", Qt::MatchWildcard).constFirst()); auto last_package_before_sort = dynamic_cast(main_window_view.m_ui.packages_to_update_list->findItems("*", Qt::MatchWildcard).constLast()); QTest::mouseClick(&*main_window_view.m_ui.sort_packages_to_update, Qt::LeftButton); @@ -312,7 +321,7 @@ void TestUpdatedPackagesColumn::notEmptyPackagesListIsVisibleAfterSignalSend() void TestUpdatedPackagesColumn::titleIsVisibleWhenPackagesListIsEmptyAfterSignalSend() { emit main_window_view.packagesToUpdateFillEnded(); - QCOMPARE(main_window_view.m_ui.packages_to_update_label->text(), i18n("Cannot be updated - try to refresh")); + QCOMPARE(main_window_view.m_ui.packages_to_update_label->text(), i18n("Couldn't be updated")); } @@ -321,6 +330,7 @@ void TestUpdatedPackagesColumn::cleanup() disconnect(main_window_view.m_ui.sort_packages_to_update, &QCheckBox::toggled, main_window_view.updated_packages_column.data(), &UpdatedPackagesColumn::sort); main_window_view.m_ui.packages_to_update_list->clear(); disconnect(main_window_view.m_ui.search_packages_to_update_lineedit, &QLineEdit::textChanged, nullptr, nullptr); + main_window_view.m_ui.console_view_update->setCheckState(Qt::Unchecked); main_window_view.m_ui.search_packages_to_update_lineedit->clear(); main_window_view.m_ui.console_view_update->setCheckState(Qt::Unchecked); main_window_view.m_ui.check_all_updates_checkbox->setCheckState(Qt::Unchecked); @@ -334,4 +344,10 @@ void TestUpdatedPackagesColumn::cleanup() if (main_window_view.m_ui.packages_to_update_list->item(0)) delete main_window_view.m_ui.packages_to_update_list->takeItem(0); } + + main_window_view.m_ui.packages_to_update_list->hide(); + main_window_view.m_ui.update_spinning_widget->show(); + main_window_view.m_ui.update_spinning_label->setText(i18n("Press \"Check\" button")); + main_window_view.m_ui.update_spinning_label->show(); + main_window_view.m_ui.update_spinning_label->setStyleSheet("color: black; font-size: 15px;"); } diff --git a/tests/gui/packagestoupdatecolumntest.h b/tests/gui/packagestoupdatecolumntest.h index 1808e2a..0cfec75 100644 --- a/tests/gui/packagestoupdatecolumntest.h +++ b/tests/gui/packagestoupdatecolumntest.h @@ -54,6 +54,7 @@ class TestUpdatedPackagesColumn : public QObject TestUpdatedPackagesColumn(QObject* parent = nullptr); private slots: + void isOnStartVisiblePressCheckButtonLabelWithProperStyle(); void updatedColumnLabelHasProperContent(); void showUpdatedColumnPreview(); void hideUpdatedColumnPreview();