Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
commit 58518e6dcbd36cd189273f5fff99dd6c8ce00e01 2 parents 0ea51d5 + de1ea77
@kmoore134 kmoore134 authored
Showing with 378 additions and 379 deletions.
  1. +7 −2 src-qt4/pc-bootconfig/mainUI.cpp
  2. +2 −0  src-qt4/pc-controlpanel/items/system/pc-bootconfig.desktop
  3. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
  4. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
  5. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
  6. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
  7. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
  8. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
  9. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
  10. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
  11. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
  12. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
  13. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
  14. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
  15. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
  16. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
  17. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
  18. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
  19. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
  20. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
  21. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
  22. +1 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
  23. +1 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
  24. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
  25. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
  26. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
  27. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
  28. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
  29. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
  30. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
  31. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
  32. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
  33. +33 −49 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
  34. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
  35. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
  36. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
  37. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
  38. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
  39. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
  40. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
  41. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
  42. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
  43. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
  44. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
  45. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
  46. +5 −7 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
  47. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
  48. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
  49. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
  50. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
  51. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
  52. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
  53. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
  54. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
  55. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
  56. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
  57. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
  58. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
  59. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
  60. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
  61. +77 −134 src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
  62. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
  63. +1 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
  64. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
  65. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
  66. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
  67. +2 −1  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
  68. +132 −125 src-qt4/pc-softwaremanager/mainUI.cpp
  69. +1 −0  src-qt4/pc-softwaremanager/mainUI.h
View
9 src-qt4/pc-bootconfig/mainUI.cpp
@@ -393,6 +393,9 @@ void mainUI::on_tool_GRUBsavedefaults_clicked(){
bool ok = saveGRUBdefaults(themefile,fontfile,countdown,showcountdown);
if(!ok){
qDebug() << "Unable to save the GRUB defaults to file:" << file_GRUBdefaults+".new";
+ }else{
+ ui->tool_GRUBsavedefaults->setEnabled(false);
+ ui->tool_GRUBresetdefaults->setEnabled(false);
}
}
@@ -418,8 +421,10 @@ void mainUI::on_tool_GRUBsaveentries_clicked(){
//Get the current text
QStringList contents = ui->text_GRUBentries->toPlainText().split("\n");
bool ok = saveGRUBcustomentries(contents);
- if(ok){ }//ui->tool_GRUBsaveentries->setEnabled(false); }
- else{
+ if(ok){
+ ui->tool_GRUBsaveentries->setEnabled(false);
+ ui->tool_GRUBresetentries->setEnabled(false);
+ }else{
qDebug() << "Error saving custom grub entries to file:" << file_GRUBentries+".new";
}
}
View
2  src-qt4/pc-controlpanel/items/system/pc-bootconfig.desktop
@@ -13,6 +13,7 @@ Name[fr]=Gestionnaire de démarrage
Name[fr_CA]=Gestionnaire de démarrage
Name[ja]=起動マネージャー
Name[pl]=Menadżer botowania
+Name[uk]=Налаштування завантаження
Name[vi]=khởi động Trình quản lý
Name[zh_CN]=启动管理器
Comment=Configure bootup options
@@ -20,5 +21,6 @@ Comment[fr]=Configurer les options de démarrage
Comment[fr_CA]=Configurer les options de démarrage
Comment[ja]=起動オプションを設定します
Comment[pl]=Konfiguruj opcje botowania.
+Comment[uk]=Налаштування завантаження комп'ютера
Comment[vi]=Cấu hình tùy chọn khởi động hệ thống
Comment[zh_CN]=配置启动选项
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
@@ -589,7 +589,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
@@ -486,7 +486,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
@@ -486,7 +486,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
@@ -518,7 +518,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
2  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
@@ -484,7 +484,7 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation>Démarrer l&apos;application</translation>
</message>
</context>
<context>
View
2  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
@@ -484,7 +484,7 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation>Démarrer l&apos;application</translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
@@ -594,7 +594,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
@@ -588,7 +588,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
82 src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
@@ -53,11 +53,11 @@
</message>
<message>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
<message>
<source>Repository Mirrors</source>
- <translation type="unfinished">リポジトリーのミラー</translation>
+ <translation>リポジトリーのミラー</translation>
</message>
<message>
<source>Move Up</source>
@@ -160,8 +160,7 @@
</message>
<message>
<source>All</source>
- <translation type="unfinished">
- </translation>
+ <translation>すべて</translation>
</message>
<message>
<source>Perform actions on checked applications</source>
@@ -180,15 +179,15 @@
</message>
<message>
<source>Version:</source>
- <translation type="unfinished">バージョン:</translation>
+ <translation>バージョン:</translation>
</message>
<message>
<source>Author:</source>
- <translation type="unfinished">作者:</translation>
+ <translation>作者:</translation>
</message>
<message>
<source>License:</source>
- <translation type="unfinished">ライセンス:</translation>
+ <translation>ライセンス:</translation>
</message>
<message>
<source>Shortcuts:</source>
@@ -202,7 +201,7 @@
</message>
<message>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
<message>
<source>Remove the selected application</source>
@@ -211,22 +210,19 @@
</message>
<message>
<source>Uninstall</source>
- <translation type="unfinished">アンインストール</translation>
+ <translation>アンインストール</translation>
</message>
<message>
<source>Update the application to the most recent version</source>
- <translation type="unfinished">
- </translation>
+ <translation>アプリケーションを最新バージョンにアップデートする</translation>
</message>
<message>
<source>Update the selected application</source>
- <translation type="unfinished">
- </translation>
+ <translation>選択したアプリケーションをアップデートします</translation>
</message>
<message>
<source>Update Application</source>
- <translation type="unfinished">
- </translation>
+ <translation>アプリケーションのアップデート</translation>
</message>
<message>
<source>Open the browser page for the selected application</source>
@@ -240,13 +236,11 @@
</message>
<message>
<source>Automatically update the selected application when an update is available</source>
- <translation type="unfinished">
- </translation>
+ <translation>選択したアプリケーションを自動的にアップデートします</translation>
</message>
<message>
<source>Auto-Update</source>
- <translation type="unfinished">
- </translation>
+ <translation>自動アップデート</translation>
</message>
<message>
<source>Browse For Apps</source>
@@ -260,8 +254,7 @@
</message>
<message>
<source>Category</source>
- <translation type="unfinished">
- </translation>
+ <translation>カテゴリー</translation>
</message>
<message>
<source>App</source>
@@ -275,7 +268,7 @@
</message>
<message>
<source>Search</source>
- <translation type="unfinished">検索</translation>
+ <translation>検索</translation>
</message>
<message>
<source>View Recent Additions</source>
@@ -289,29 +282,27 @@
</message>
<message>
<source>Size:</source>
- <translation type="unfinished">サイズ:</translation>
+ <translation>サイズ:</translation>
</message>
<message>
<source>Application Information</source>
- <translation type="unfinished">
- </translation>
+ <translation>アプリケーションの情報</translation>
</message>
<message>
<source>Platform:</source>
- <translation type="unfinished">プラットフォーム:</translation>
+ <translation>プラットフォーム:</translation>
</message>
<message>
<source>Type:</source>
- <translation type="unfinished">タイプ:</translation>
+ <translation>タイプ:</translation>
</message>
<message>
<source>Similar Applications</source>
- <translation type="unfinished">
- </translation>
+ <translation>似ているアプリケーション</translation>
</message>
<message>
<source>Best Matches</source>
- <translation type="unfinished">最も近い候補</translation>
+ <translation>最も近い候補</translation>
</message>
<message>
<source>Other Results</source>
@@ -320,46 +311,39 @@
</message>
<message>
<source>File</source>
- <translation type="unfinished">
- </translation>
+ <translation>ファイル</translation>
</message>
<message>
<source>Configure</source>
- <translation type="unfinished">
- </translation>
+ <translation>設定</translation>
</message>
<message>
<source>Import PBI List</source>
- <translation type="unfinished">
- </translation>
+ <translation>PBI リストのインポート</translation>
</message>
<message>
<source>Export PBI List</source>
- <translation type="unfinished">
- </translation>
+ <translation>PBI リストのエクスポート</translation>
</message>
<message>
<source>&amp;Quit</source>
- <translation type="unfinished">終了(&amp;Q)</translation>
+ <translation>終了(&amp;Q)</translation>
</message>
<message>
<source>Repositories</source>
- <translation type="unfinished">
- </translation>
+ <translation>リポジトリー</translation>
</message>
<message>
<source>AppCafe Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>AppCafe の設定</translation>
</message>
<message>
<source>Error!</source>
- <translation type="unfinished">エラー!</translation>
+ <translation>エラー!</translation>
</message>
<message>
<source>The AppCafe must be run as root when in Warden compatibility mode</source>
- <translation type="unfinished">
- </translation>
+ <translation>AppCafe は Warden 互換モードでは root 権限で動作させる必要があります</translation>
</message>
<message>
<source>The AppCafe must be started with user permissions!</source>
@@ -368,8 +352,7 @@
</message>
<message>
<source>The user must also be a part of the &quot;operator&quot; group</source>
- <translation type="unfinished">
- </translation>
+ <translation>ユーザーは &quot;operator&quot; グループに所属している必要があります</translation>
</message>
<message>
<source>AppCafe Processes Running</source>
@@ -551,7 +534,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
@@ -602,7 +602,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
@@ -599,7 +599,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
@@ -596,7 +596,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
12 src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
@@ -93,18 +93,15 @@
</message>
<message>
<source>This repo could not be added.</source>
- <translation type="unfinished">
- </translation>
+ <translation>To repozytorium nie może zostać dodane.</translation>
</message>
<message>
<source>Please run the command &apos;%1&apos; manually to see the full error message.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Proszę uruchomić polecenie &apos;%1&apos; ręcznie aby zobaczyć pełną treść błędu.</translation>
</message>
<message>
<source>Verify Removal</source>
- <translation type="unfinished">
- </translation>
+ <translation>Usunięcie weryfikacji</translation>
</message>
<message>
<source>Are you sure you wish to remove this PBI repository?</source>
@@ -563,7 +560,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
@@ -596,7 +596,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
@@ -596,7 +596,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
@@ -585,7 +585,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
211 src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
@@ -85,364 +85,306 @@
</message>
<message>
<source>This repo should be ready to use in a short time (depending on your internet connection speed).</source>
- <translation type="unfinished">
- </translation>
+ <translation>Цей репозиторій буде повністю готовий до використання через деякий час (залежно від швидкості з&apos;єднання з мережею)</translation>
</message>
<message>
<source>Repo Failure</source>
- <translation type="unfinished">
- </translation>
+ <translation>Помилка репозиторію</translation>
</message>
<message>
<source>This repo could not be added.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Цей репозиторій не може бети доданий.</translation>
</message>
<message>
<source>Please run the command &apos;%1&apos; manually to see the full error message.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Будьласка запустіть консольну команду &apos;%1&apos; вручну щоб побачити повне сповіщення про помилку.</translation>
</message>
<message>
<source>Verify Removal</source>
- <translation type="unfinished">
- </translation>
+ <translation>Видалення</translation>
</message>
<message>
<source>Are you sure you wish to remove this PBI repository?</source>
- <translation type="unfinished">
- </translation>
+ <translation>ви певні що бажаєте видалити цей репозиторій PBI?</translation>
</message>
<message>
<source>This repo could not be removed.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Цей репозиторій не може бути видалений.</translation>
</message>
<message>
<source>New Mirror URL</source>
- <translation type="unfinished">
- </translation>
+ <translation>Нова URL адреса дзеркала</translation>
</message>
<message>
<source>Please enter the URL for the new repo mirror:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Будьласка введіть URL адресу для нового дзеркала:</translation>
</message>
<message>
<source>Mirror Change Error</source>
- <translation type="unfinished">
- </translation>
+ <translation>Помилка зміни дзеркала</translation>
</message>
<message>
<source>The full error is displayed in the AppCafe terminal output.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Повний текст помилки відображено у термінальному виведенні програми AppCafe.</translation>
</message>
<message>
<source>Select Download Directory</source>
- <translation type="unfinished">
- </translation>
+ <translation>Обрати каталог для завантаженнь</translation>
</message>
</context>
<context>
<name>MainUI</name>
<message>
<source>AppCafe</source>
- <translation type="unfinished">AppCafe</translation>
+ <translation>AppCafe</translation>
</message>
<message>
<source>Installed</source>
- <translation type="unfinished">Встановлено</translation>
+ <translation>Встановлено</translation>
</message>
<message>
<source>Program Name</source>
- <translation type="unfinished">Назва програми</translation>
+ <translation>Назва програми</translation>
</message>
<message>
<source>Version</source>
- <translation type="unfinished">
- </translation>
+ <translation>Версія</translation>
</message>
<message>
<source>Status</source>
- <translation type="unfinished">Стан</translation>
+ <translation>Стан</translation>
</message>
<message>
<source>Check/Uncheck all applications</source>
- <translation type="unfinished">
- </translation>
+ <translation>Обрати/зняти виділення для всіх додатків</translation>
</message>
<message>
<source>All</source>
- <translation type="unfinished">
- </translation>
+ <translation>Всі</translation>
</message>
<message>
<source>Perform actions on checked applications</source>
- <translation type="unfinished">
- </translation>
+ <translation>Дії з обраними додатками</translation>
</message>
<message>
<source>Actions</source>
- <translation type="unfinished">
- </translation>
+ <translation>Дії</translation>
</message>
<message>
<source>Application Details</source>
- <translation type="unfinished">
- </translation>
+ <translation>Деталі додатку</translation>
</message>
<message>
<source>Version:</source>
- <translation type="unfinished">Версія:</translation>
+ <translation>Версія:</translation>
</message>
<message>
<source>Author:</source>
- <translation type="unfinished">Автор:</translation>
+ <translation>Автор:</translation>
</message>
<message>
<source>License:</source>
- <translation type="unfinished">Ліцензія:</translation>
+ <translation>Ліцензія:</translation>
</message>
<message>
<source>Shortcuts:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Ярлики:</translation>
</message>
<message>
<source>Cancel any actions for this application</source>
- <translation type="unfinished">
- </translation>
+ <translation>Відмінити будь-які поточні дії з цим додаткрм</translation>
</message>
<message>
<source>...</source>
- <translation type="unfinished">...</translation>
+ <translation>...</translation>
</message>
<message>
<source>Remove the selected application</source>
- <translation type="unfinished">
- </translation>
+ <translation>Видалити обраний додаток</translation>
</message>
<message>
<source>Uninstall</source>
- <translation type="unfinished">Видалення</translation>
+ <translation>Видалення</translation>
</message>
<message>
<source>Update the application to the most recent version</source>
- <translation type="unfinished">
- </translation>
+ <translation>Оновити додаток до найновішої версії</translation>
</message>
<message>
<source>Update the selected application</source>
- <translation type="unfinished">
- </translation>
+ <translation>Оновити обраний додаток</translation>
</message>
<message>
<source>Update Application</source>
- <translation type="unfinished">
- </translation>
+ <translation>Оновити додаток</translation>
</message>
<message>
<source>Open the browser page for the selected application</source>
- <translation type="unfinished">
- </translation>
+ <translation>Відкрити сторінку огляду для обраного додатку</translation>
</message>
<message>
<source>Open Browser</source>
- <translation type="unfinished">
- </translation>
+ <translation>Відкрити огляд</translation>
</message>
<message>
<source>Automatically update the selected application when an update is available</source>
- <translation type="unfinished">
- </translation>
+ <translation>Автоматично оновлювати обраний додаток за наявності нової версії</translation>
</message>
<message>
<source>Auto-Update</source>
- <translation type="unfinished">
- </translation>
+ <translation>Автооновлення</translation>
</message>
<message>
<source>Browse For Apps</source>
- <translation type="unfinished">
- </translation>
+ <translation>Перегляд додатків</translation>
</message>
<message>
<source>Home</source>
- <translation type="unfinished">
- </translation>
+ <translation>Головна сторінка</translation>
</message>
<message>
<source>Category</source>
- <translation type="unfinished">
- </translation>
+ <translation>Категорія</translation>
</message>
<message>
<source>App</source>
- <translation type="unfinished">
- </translation>
+ <translation>Додаток</translation>
</message>
<message>
<source>Search Here</source>
- <translation type="unfinished">
- </translation>
+ <translation>Шукати тут</translation>
</message>
<message>
<source>Search</source>
- <translation type="unfinished">Пошук</translation>
+ <translation>Пошук</translation>
</message>
<message>
<source>View Recent Additions</source>
- <translation type="unfinished">
- </translation>
+ <translation>Перегляд останніх доданих</translation>
</message>
<message>
<source>Browse By Category</source>
- <translation type="unfinished">
- </translation>
+ <translation>Перегляд за категоріями</translation>
</message>
<message>
<source>Size:</source>
- <translation type="unfinished">Розмір:</translation>
+ <translation>Розмір:</translation>
</message>
<message>
<source>Application Information</source>
- <translation type="unfinished">
- </translation>
+ <translation>Інформація про додаток</translation>
</message>
<message>
<source>Platform:</source>
- <translation type="unfinished">Платформа:</translation>
+ <translation>Платформа:</translation>
</message>
<message>
<source>Type:</source>
- <translation type="unfinished">Тип:</translation>
+ <translation>Тип:</translation>
</message>
<message>
<source>Similar Applications</source>
- <translation type="unfinished">
- </translation>
+ <translation>Подібні додатки</translation>
</message>
<message>
<source>Best Matches</source>
- <translation type="unfinished">Найкращі дзеркала</translation>
+ <translation>Найповніші співпадіння</translation>
</message>
<message>
<source>Other Results</source>
- <translation type="unfinished">
- </translation>
+ <translation>Інші результати</translation>
</message>
<message>
<source>File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Файл</translation>
</message>
<message>
<source>Configure</source>
- <translation type="unfinished">
- </translation>
+ <translation>Налаштування</translation>
</message>
<message>
<source>Import PBI List</source>
- <translation type="unfinished">
- </translation>
+ <translation>Імпортувати список PBI</translation>
</message>
<message>
<source>Export PBI List</source>
- <translation type="unfinished">
- </translation>
+ <translation>Експортувати список PBI</translation>
</message>
<message>
<source>&amp;Quit</source>
- <translation type="unfinished">Вихід</translation>
+ <translation>Вихід</translation>
</message>
<message>
<source>Repositories</source>
- <translation type="unfinished">
- </translation>
+ <translation>Репозиторії</translation>
</message>
<message>
<source>AppCafe Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>Налаштування AppCafe</translation>
</message>
<message>
<source>Error!</source>
- <translation type="unfinished">Помилка!</translation>
+ <translation>Помилка!</translation>
</message>
<message>
<source>The AppCafe must be run as root when in Warden compatibility mode</source>
- <translation type="unfinished">
- </translation>
+ <translation>AppCafe має бути запущена в режимі адміністратора (root) для використання в режимі сумісності з Warden</translation>
</message>
<message>
<source>The AppCafe must be started with user permissions!</source>
- <translation type="unfinished">
- </translation>
+ <translation>AppCafe має виконуватися з правами звичайного користувача!</translation>
</message>
<message>
<source>The user must also be a part of the &quot;operator&quot; group</source>
- <translation type="unfinished">
- </translation>
+ <translation>користувач має бути членом групи &quot;operator&quot;</translation>
</message>
<message>
<source>AppCafe Processes Running</source>
- <translation type="unfinished">
- </translation>
+ <translation>Незавершені дії AppCafe</translation>
</message>
<message>
<source>The AppCafe currently has actions pending. Do you want to cancel all running processes and quit anyway?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Деякі дії ще не завершено. Бажаєте відмінити всі поточні дії, завершити запущені процеси та вийти?</translation>
</message>
<message>
<source>Import PBI File List</source>
- <translation type="unfinished">
- </translation>
+ <translation>Файл списку імпорту PBI</translation>
</message>
<message>
<source>PBI List (*.pbilist)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Списки PBI (*.pbilist)</translation>
</message>
<message>
<source>Import Error</source>
- <translation type="unfinished">
- </translation>
+ <translation>Помилка імпорту</translation>
</message>
<message>
<source>There was an error importing the PBI list</source>
- <translation type="unfinished">
- </translation>
+ <translation>Сталася помилка при імпорті списку PBI</translation>
</message>
<message>
<source>Please make sure that the file has not been corrupted and try again</source>
- <translation type="unfinished">
- </translation>
+ <translation>Будьласка впевніться що файл списку не є пошкодженим та спробуйте знову</translation>
</message>
<message>
<source>Export PBI File List</source>
- <translation type="unfinished">
- </translation>
+ <translation>Експорт списку PBI</translation>
</message>
<message>
<source>Export Error</source>
- <translation type="unfinished">
- </translation>
+ <translation>Помилка експорту</translation>
</message>
<message>
<source>There was an error exporting the PBI list</source>
- <translation type="unfinished">
- </translation>
+ <translation>Сталася помилка експорту списку PBI</translation>
</message>
<message>
<source>Please make sure that you have the proper directory permissions and try again</source>
- <translation type="unfinished">
- </translation>
+ <translation>Будьласка впевніться у тому що маєте права на запис у каталог та спробуйте ще раз</translation>
</message>
<message>
<source>Update</source>
- <translation type="unfinished">Оновити</translation>
+ <translation>Оновити</translation>
</message>
<message>
<source>Desktop Icons</source>
@@ -565,7 +507,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
2  src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
@@ -484,7 +484,7 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation>Bắt đầu ứng dụng</translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
@@ -583,7 +583,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
3  src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
@@ -603,7 +603,8 @@
</message>
<message>
<source>Start the application</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished">
+ </translation>
</message>
</context>
<context>
View
257 src-qt4/pc-softwaremanager/mainUI.cpp
@@ -265,7 +265,7 @@ void MainUI::slotRefreshInstallTab(){
ui->tree_install_apps->resizeColumnToContents(i);
}
}
- on_tree_install_apps_itemSelectionChanged(); //Update the info boxes
+ slotUpdateSelectedPBI();; //Update the info boxes
slotDisplayStats();
}
@@ -281,7 +281,7 @@ void MainUI::slotPBIStatusUpdate(QString pbiID){
appID = ui->tree_install_apps->currentItem()->whatsThis(0);
}
if ( appID == pbiID ) {
- on_tree_install_apps_itemSelectionChanged();
+ slotUpdateSelectedPBI(true);; //only update status
}
return; // Found our match, we can return now
}
@@ -313,129 +313,7 @@ void MainUI::on_tool_install_toggleall_clicked(){
void MainUI::on_tree_install_apps_itemSelectionChanged(){
//When an installed PBI is clicked on
- QString appID;
- if(ui->tree_install_apps->topLevelItemCount() > 0){
- appID = ui->tree_install_apps->currentItem()->whatsThis(0);
- }
- if(appID.isEmpty()){
- ui->group_install_info->setVisible(FALSE);
- return;
- }else{
- ui->group_install_info->setVisible( ui->group_install_showinfo->isChecked() );
- }
-
- //Get the PBI info for that item
- QStringList vals;
- vals << "name" << "icon" << "author" << "website" << "version" << "license";
- QStringList bools;
- bools << "autoupdate" << "hasdesktopicons" << "hasmenuicons" << "requiresroot";
- vals = PBI->PBIInfo(appID,vals);
- bools = PBI->PBIInfo(appID,bools);
- //Make sure the info lists are not empty
- if(vals.isEmpty() || bools.isEmpty()){
- ui->group_install_info->setVisible(FALSE);
- return;
- }
- //Load a default icon if none found
- if(vals[1].isEmpty()){ vals[1] = defaultIcon; }
- //Now set the info on the UI
- bool desktopSC = (bools[1] == "true"); // XDG desktop entries available
- bool menuSC= (bools[2] == "true"); // XDG menu entries available
- bool autoupdate = (bools[0] == "true"); //auto-update enabled
- bool rootonly = (bools[3] == "true"); //requires root
- //Create the shortcuts string
- QString shortcuts;
- if(desktopSC && menuSC){ shortcuts = tr("Desktop/Menu"); }
- else if(desktopSC){ shortcuts = tr("Desktop"); }
- else if(menuSC){ shortcuts = tr("Menu"); }
- else{ shortcuts = tr("None"); }
- //Now display that info on the UI
- ui->label_install_app->setText(vals[0]);
- ui->tool_install_icon->setIcon( QIcon(vals[1]) );
- if(vals[3].isEmpty()){
- ui->label_install_author->setText(vals[2]);
- ui->label_install_author->setToolTip("");
- }else{
- ui->label_install_author->setText("<a href="+vals[3]+">"+vals[2]+"</a>");
- ui->label_install_author->setToolTip(vals[3]); //show website URL as tooltip
- }
- ui->label_install_license->setText(vals[5]);
- ui->label_install_version->setText(vals[4]);
- ui->label_install_shortcuts->setText(shortcuts);
- ui->check_install_autoupdate->setChecked(autoupdate);
-
- //Adjust the quick action buttons as necessary
- if( PBI->isWorking(appID) ){
- //Actions pending/working only show cancel button
- ui->tool_install_cancel->setVisible(TRUE);
- ui->tool_install_remove->setVisible(FALSE);
- ui->tool_install_update->setVisible(FALSE);
- }else{
- //Nothing pending
- ui->tool_install_cancel->setVisible(FALSE);
- if( !PBI->isInstalled(appID).isEmpty() ){
- //Remove Button
- ui->tool_install_remove->setVisible(TRUE);
- if(rootonly){ ui->tool_install_remove->setIcon(QIcon(":icons/remove-root.png")); }
- else{ ui->tool_install_remove->setIcon(QIcon(":icons/remove.png")); }
- //Update
- if(PBI->upgradeAvailable(appID).isEmpty()){ ui->tool_install_update->setVisible(FALSE); }
- else{
- ui->tool_install_update->setVisible(TRUE);
- if(rootonly){ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small-root.png")); }
- else{ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small.png")); }
- }
- }else{
- ui->tool_install_remove->setVisible(FALSE);
- ui->tool_install_update->setVisible(FALSE);
- }
- }
- //Update the current status indicators
- QString stat = PBI->currentAppStatus(appID,true); //get the raw status
- if(stat.isEmpty() || stat == "DLSTART" || stat == "DLDONE"){
- //Not currently running - hide the display indicators
- ui->group_install_appStat->setVisible(FALSE);
- }else if(stat.startsWith("DLSTAT::")){
- //Currently downloading - show download status indicators
- QString percent = stat.section("::",1,1);
- QString total = stat.section("::",2,2);
- QString speed = stat.section("::",3,3);
- ui->group_install_appStat->setVisible(TRUE);
- ui->progress_install_DL->setVisible(TRUE);
- if(total == "??"){ ui->label_install_status->setText( tr("Downloading file:") ); }
- else{ ui->label_install_status->setText( QString(tr("Downloading %1 file:")).arg(total) ); }
- if(percent == "??"){
- ui->progress_install_DL->setMinimum(0); ui->progress_install_DL->setMaximum(0);
- }else{
- ui->progress_install_DL->setMinimum(0); ui->progress_install_DL->setMaximum(100);
- ui->progress_install_DL->setValue( int(percent.toFloat()) );
- }
- if(speed == "??"){ ui->label_install_DL->setVisible(FALSE); }
- else{
- ui->label_install_DL->setVisible(TRUE);
- ui->label_install_DL->setText(speed);
- }
- }else{
- //Currently installing/removing/updating - show last message from process
- ui->label_install_status->setText(stat);
- ui->group_install_appStat->setVisible(TRUE);
- ui->progress_install_DL->setVisible(FALSE);
- ui->label_install_DL->setVisible(FALSE);
- }
- //Get the application binaries and set the icon to start them
- QStringList bins = PBI->pbiBinList(appID);
- appBinMenu->clear();
- if(bins.isEmpty()){
- ui->tool_install_icon->setAutoRaise(false);
- }else{
- ui->tool_install_icon->setAutoRaise(true);
- for(int i=0; i<bins.length(); i++){
- QAction *act = new QAction(this);
- act->setText(bins[i].section("::::",0,0)); //set name
- act->setWhatsThis(bins[i].section("::::",1,10)); //set command string
- appBinMenu->addAction(act);
- }
- }
+ slotUpdateSelectedPBI();
}
void MainUI::on_check_install_autoupdate_clicked(){
@@ -574,6 +452,135 @@ void MainUI::slotStartApp(QAction* act){
QProcess::startDetached(cmd);
}
+void MainUI::slotUpdateSelectedPBI(bool statusonly){
+ QString appID;
+ if(ui->tree_install_apps->topLevelItemCount() > 0){
+ appID = ui->tree_install_apps->currentItem()->whatsThis(0);
+ }
+ if(appID.isEmpty()){
+ ui->group_install_info->setVisible(FALSE);
+ return;
+ }else{
+ ui->group_install_info->setVisible( ui->group_install_showinfo->isChecked() );
+ }
+ if(!statusonly){
+ //Get the PBI info for that item
+ QStringList vals;
+ vals << "name" << "icon" << "author" << "website" << "version" << "license";
+ QStringList bools;
+ bools << "autoupdate" << "hasdesktopicons" << "hasmenuicons" << "requiresroot";
+ vals = PBI->PBIInfo(appID,vals);
+ bools = PBI->PBIInfo(appID,bools);
+ //Make sure the info lists are not empty
+ if(vals.isEmpty() || bools.isEmpty()){
+ ui->group_install_info->setVisible(FALSE);
+ return;
+ }
+ //Load a default icon if none found
+ if(vals[1].isEmpty()){ vals[1] = defaultIcon; }
+ //Now set the info on the UI
+ bool desktopSC = (bools[1] == "true"); // XDG desktop entries available
+ bool menuSC= (bools[2] == "true"); // XDG menu entries available
+ bool autoupdate = (bools[0] == "true"); //auto-update enabled
+ bool rootonly = (bools[3] == "true"); //requires root
+ //Create the shortcuts string
+ QString shortcuts;
+ if(desktopSC && menuSC){ shortcuts = tr("Desktop/Menu"); }
+ else if(desktopSC){ shortcuts = tr("Desktop"); }
+ else if(menuSC){ shortcuts = tr("Menu"); }
+ else{ shortcuts = tr("None"); }
+ //Now display that info on the UI
+ ui->label_install_app->setText(vals[0]);
+ ui->tool_install_icon->setIcon( QIcon(vals[1]) );
+ if(vals[3].isEmpty()){
+ ui->label_install_author->setText(vals[2]);
+ ui->label_install_author->setToolTip("");
+ }else{
+ ui->label_install_author->setText("<a href="+vals[3]+">"+vals[2]+"</a>");
+ ui->label_install_author->setToolTip(vals[3]); //show website URL as tooltip
+ }
+ ui->label_install_license->setText(vals[5]);
+ ui->label_install_version->setText(vals[4]);
+ ui->label_install_shortcuts->setText(shortcuts);
+ ui->check_install_autoupdate->setChecked(autoupdate);
+
+ //Adjust the quick action buttons as necessary
+ if( PBI->isWorking(appID) ){
+ //Actions pending/working only show cancel button
+ ui->tool_install_cancel->setVisible(TRUE);
+ ui->tool_install_remove->setVisible(FALSE);
+ ui->tool_install_update->setVisible(FALSE);
+ }else{
+ //Nothing pending
+ ui->tool_install_cancel->setVisible(FALSE);
+ if( !PBI->isInstalled(appID).isEmpty() ){
+ //Remove Button
+ ui->tool_install_remove->setVisible(TRUE);
+ if(rootonly){ ui->tool_install_remove->setIcon(QIcon(":icons/remove-root.png")); }
+ else{ ui->tool_install_remove->setIcon(QIcon(":icons/remove.png")); }
+ //Update
+ if(PBI->upgradeAvailable(appID).isEmpty()){ ui->tool_install_update->setVisible(FALSE); }
+ else{
+ ui->tool_install_update->setVisible(TRUE);
+ if(rootonly){ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small-root.png")); }
+ else{ ui->tool_install_update->setIcon(QIcon(":icons/app_upgrade_small.png")); }
+ }
+ }else{
+ ui->tool_install_remove->setVisible(FALSE);
+ ui->tool_install_update->setVisible(FALSE);
+ }
+ }
+ }
+ //Update the current status indicators
+ QString stat = PBI->currentAppStatus(appID,true); //get the raw status
+ if(stat.isEmpty() || stat == "DLSTART" || stat == "DLDONE"){
+ //Not currently running - hide the display indicators
+ ui->group_install_appStat->setVisible(FALSE);
+ }else if(stat.startsWith("DLSTAT::")){
+ //Currently downloading - show download status indicators
+ QString percent = stat.section("::",1,1);
+ QString total = stat.section("::",2,2);
+ QString speed = stat.section("::",3,3);
+ ui->group_install_appStat->setVisible(TRUE);
+ ui->progress_install_DL->setVisible(TRUE);
+ if(total == "??"){ ui->label_install_status->setText( tr("Downloading file:") ); }
+ else{ ui->label_install_status->setText( QString(tr("Downloading %1 file:")).arg(total) ); }
+ if(percent == "??"){
+ ui->progress_install_DL->setMinimum(0); ui->progress_install_DL->setMaximum(0);
+ }else{
+ ui->progress_install_DL->setMinimum(0); ui->progress_install_DL->setMaximum(100);
+ ui->progress_install_DL->setValue( int(percent.toFloat()) );
+ }
+ if(speed == "??"){ ui->label_install_DL->setVisible(FALSE); }
+ else{
+ ui->label_install_DL->setVisible(TRUE);
+ ui->label_install_DL->setText(speed);
+ }
+ }else{
+ //Currently installing/removing/updating - show last message from process
+ ui->label_install_status->setText(stat);
+ ui->group_install_appStat->setVisible(TRUE);
+ ui->progress_install_DL->setVisible(FALSE);
+ ui->label_install_DL->setVisible(FALSE);
+ }
+ if(!statusonly){
+ //Get the application binaries and set the icon to start them
+ QStringList bins = PBI->pbiBinList(appID);
+ appBinMenu->clear();
+ if(bins.isEmpty()){
+ ui->tool_install_icon->setAutoRaise(false);
+ }else{
+ ui->tool_install_icon->setAutoRaise(true);
+ for(int i=0; i<bins.length(); i++){
+ QAction *act = new QAction(this);
+ act->setText(bins[i].section("::::",0,0)); //set name
+ act->setWhatsThis(bins[i].section("::::",1,10)); //set command string
+ appBinMenu->addAction(act);
+ }
+ }
+ }
+}
+
// ==========================
// ====== BROWSER TAB =======
// ==========================
View
1  src-qt4/pc-softwaremanager/mainUI.h
@@ -78,6 +78,7 @@ private slots:
void slotActionRemove();
void slotActionCancel();
void slotStartApp(QAction*);
+ void slotUpdateSelectedPBI(bool statusonly=false);
//BROWSER TAB
void slotDisableBrowser(bool shownotification = TRUE);
Please sign in to comment.
Something went wrong with that request. Please try again.