From 9e10625d3c9a61553799d36d927b1a07b168de89 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Thu, 13 Apr 2017 17:16:57 +0300 Subject: [PATCH] gui: Add thumbnail option Signed-off-by: Yan Burman --- ChangeLog | 1 + gui/converter.py | 8 +++- gui/converter.wxg | 12 +++++- gui/locale/en/LC_MESSAGES/converter.mo | Bin 391 -> 391 bytes gui/locale/en/LC_MESSAGES/converter.po | 54 +++++++++++++----------- gui/locale/he/LC_MESSAGES/converter.mo | Bin 1451 -> 1608 bytes gui/locale/he/LC_MESSAGES/converter.po | 54 +++++++++++++----------- gui/locale/messages.pot | 52 +++++++++++++---------- gui/locale/ru/LC_MESSAGES/converter.mo | Bin 1765 -> 1950 bytes gui/locale/ru/LC_MESSAGES/converter.po | 55 ++++++++++++++----------- 10 files changed, 142 insertions(+), 94 deletions(-) diff --git a/ChangeLog b/ChangeLog index f87f616..42b8595 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ v1.1.1 +* Added thumbnail option to GUI (needed by some applications e.g. darktable) * Slightly improved default white balance for SJ5000x and M20 * Fixed GUI translations on windows * Added support for SJ6 Legend diff --git a/gui/converter.py b/gui/converter.py index 88e6004..77cc656 100755 --- a/gui/converter.py +++ b/gui/converter.py @@ -126,6 +126,7 @@ def __init__(self, *args, **kwds): self.dst_folder_button = wx.Button(self, wx.ID_ANY, _("Destination folder")) self.tiff_checkbox = wx.CheckBox(self, wx.ID_ANY, _("TIFF")) self.dng_checkbox = wx.CheckBox(self, wx.ID_ANY, _("DNG")) + self.thumb_checkbox = wx.CheckBox(self, wx.ID_ANY, _("Thumbnail")) self.convert_button = wx.Button(self, wx.ID_ANY, _("Convert")) self.status_text_ctrl = wx.TextCtrl(self, wx.ID_ANY, "", style=wx.TE_MULTILINE | wx.TE_READONLY) self.abort_button = wx.Button(self, wx.ID_ANY, _("Abort")) @@ -154,13 +155,14 @@ def __set_properties(self): self.tiff_checkbox.SetToolTip(wx.ToolTip(_("Convert to TIFF"))) self.dng_checkbox.SetToolTip(wx.ToolTip(_("Convert to DNG"))) self.dng_checkbox.SetValue(1) + self.thumb_checkbox.SetToolTip(wx.ToolTip(_("Create thumbnail (needed by some editors e.g. darktable)"))) self.abort_button.Enable(False) # end wxGlade def __do_layout(self): # begin wxGlade: MainFrame.__do_layout grid_sizer_1 = wx.FlexGridSizer(5, 2, 0, 0) - grid_sizer_2 = wx.GridSizer(1, 2, 0, 0) + grid_sizer_2 = wx.GridSizer(1, 3, 0, 0) grid_sizer_1.Add((20, 20), 0, 0, 0) grid_sizer_1.Add(self.logo_bitmap, 0, wx.ALIGN_CENTER, 0) grid_sizer_1.Add(self.src_dir_text_ctrl, 0, wx.EXPAND, 0) @@ -169,6 +171,7 @@ def __do_layout(self): grid_sizer_1.Add(self.dst_folder_button, 0, wx.ALIGN_RIGHT | wx.EXPAND, 0) grid_sizer_2.Add(self.tiff_checkbox, 0, 0, 0) grid_sizer_2.Add(self.dng_checkbox, 0, 0, 0) + grid_sizer_2.Add(self.thumb_checkbox, 0, 0, 0) grid_sizer_1.Add(grid_sizer_2, 1, 0, 0) grid_sizer_1.Add(self.convert_button, 0, wx.ALL | wx.EXPAND, 2) grid_sizer_1.Add(self.status_text_ctrl, 0, wx.EXPAND, 0) @@ -212,6 +215,9 @@ def OnConvert(self, event): # wxGlade: MainFrame. if self.dng_checkbox.IsChecked(): args.append('-d') + if self.thumb_checkbox.IsChecked(): + args.append('-m') + if not self.dest_dir_text_ctrl.IsEmpty(): args.append('-o') args.append(self.dest_dir_text_ctrl.GetValue()) diff --git a/gui/converter.wxg b/gui/converter.wxg index 7bd355d..5faba84 100644 --- a/gui/converter.wxg +++ b/gui/converter.wxg @@ -1,5 +1,5 @@ - + @@ -99,7 +99,7 @@ 0 1 - 2 + 3 0 0 @@ -118,6 +118,14 @@ Convert to DNG + + 0 + + + + Create thumbnail (needed by some editors e.g. darktable) + + diff --git a/gui/locale/en/LC_MESSAGES/converter.mo b/gui/locale/en/LC_MESSAGES/converter.mo index 8d452c47d66ef4c398257445e6d9f8c0d1857597..45bcd799e6e0e9c1d1ba6402cca2cec22f0acf6d 100644 GIT binary patch delta 66 zcmZo?ZfBlQZDFo!V4`bitYBzvWoW5wU~FK(72vNMlvylWKYNcRgV2G}6 H;^r#=IRp{2 delta 66 zcmZo?ZfBlQZDFQsXsByosbFYoWniXlU}Rvx72vNMlvylWKYNcRgV2G}6 H;^r#=H|`Os diff --git a/gui/locale/en/LC_MESSAGES/converter.po b/gui/locale/en/LC_MESSAGES/converter.po index ba38d1e..3f76436 100644 --- a/gui/locale/en/LC_MESSAGES/converter.po +++ b/gui/locale/en/LC_MESSAGES/converter.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-09 15:06+0200\n" -"PO-Revision-Date: 2016-11-09 15:06+0200\n" +"POT-Creation-Date: 2017-04-13 17:19+0300\n" +"PO-Revision-Date: 2017-04-13 17:19+0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -18,86 +18,94 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: converter.py:101 +#: converter.py:117 msgid "&About" msgstr "" -#: converter.py:99 +#: converter.py:115 msgid "&File" msgstr "" -#: converter.py:103 +#: converter.py:119 msgid "&Help" msgstr "" -#: converter.py:114 +#: converter.py:132 msgid "Abort" msgstr "" -#: converter.py:40 converter.py:101 +#: converter.py:42 converter.py:117 msgid "About" msgstr "" -#: converter.py:169 +#: converter.py:194 msgid "Choose destination folder" msgstr "" -#: converter.py:162 +#: converter.py:187 msgid "Choose source folder" msgstr "" -#: converter.py:112 +#: converter.py:130 msgid "Convert" msgstr "" -#: converter.py:135 +#: converter.py:156 msgid "Convert to DNG" msgstr "" -#: converter.py:134 +#: converter.py:155 msgid "Convert to TIFF" msgstr "" -#: converter.py:111 +#: converter.py:158 +msgid "Create thumbnail (needed by some editors e.g. darktable)" +msgstr "" + +#: converter.py:128 msgid "DNG" msgstr "" -#: converter.py:109 +#: converter.py:126 msgid "Destination folder" msgstr "" -#: converter.py:97 +#: converter.py:113 msgid "E&xit\tCtrl-Q" msgstr "" -#: converter.py:179 converter.py:198 +#: converter.py:204 converter.py:226 msgid "Error!" msgstr "" -#: converter.py:97 +#: converter.py:113 msgid "Exit" msgstr "" -#: converter.py:179 +#: converter.py:204 msgid "Must select at least one output format (DNG/TIFF)" msgstr "" -#: converter.py:198 +#: converter.py:226 msgid "Must select source folder" msgstr "" -#: converter.py:131 +#: converter.py:152 msgid "SJCAM RAW Converter" msgstr "" -#: converter.py:107 +#: converter.py:124 msgid "Source folder" msgstr "" -#: converter.py:57 +#: converter.py:73 msgid "Starting conversion" msgstr "" -#: converter.py:110 +#: converter.py:127 msgid "TIFF" msgstr "" + +#: converter.py:129 +msgid "Thumbnail" +msgstr "" diff --git a/gui/locale/he/LC_MESSAGES/converter.mo b/gui/locale/he/LC_MESSAGES/converter.mo index 30f6ddb4ff45b7bcacad127c56e9b30c0dd2e94f..6e8a766dca450771cc43766055fb63c785cd3911 100644 GIT binary patch delta 692 zcmYk&JxH5D7{Kw1#>Se|ue5`o9EE~GqHp}*6~U>kTTv98ToQ8BkS|Emf`d3Xb|@I4 z1fi`N#1Be`mM#um9CUO#a1b2?7Yl_#p+o8ac?p<GEeIjKpPAn{&HDkWRw-x95YFK!F5(!*7~%%{#x%?xH)?Q*c|1Xj=ct0WIDt<%g57NW zf!j3u!7|U+**uIpnY&nIeSjrA#u>ao{b&md^fw)DRQLfk=`*Tf7d7b@s=+U+kjF8s zV1Ns_iTdsor|=53{|1>a9SYK)R3FNu!Q95*;-Zf=sX_y=&x~t9=m-@qspbKxVRXd* uLq{7X@6Kh?%ngFLYHc-Io43pLC|-(cNz<(qSx2k&n!USskDTPp>-_;)qb=e9 diff --git a/gui/locale/he/LC_MESSAGES/converter.po b/gui/locale/he/LC_MESSAGES/converter.po index 24e9233..41d28af 100644 --- a/gui/locale/he/LC_MESSAGES/converter.po +++ b/gui/locale/he/LC_MESSAGES/converter.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-09 15:06+0200\n" -"PO-Revision-Date: 2017-04-09 08:21+0300\n" +"POT-Creation-Date: 2017-04-13 17:20+0300\n" +"PO-Revision-Date: 2017-04-13 17:27+0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: he\n" @@ -18,89 +18,97 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: converter.py:101 +#: converter.py:117 msgid "&About" msgstr "&אודות" -#: converter.py:99 +#: converter.py:115 msgid "&File" msgstr "&קובץ" -#: converter.py:103 +#: converter.py:119 msgid "&Help" msgstr "&עזרא" -#: converter.py:114 +#: converter.py:132 msgid "Abort" msgstr "הפסק" -#: converter.py:40 converter.py:101 +#: converter.py:42 converter.py:117 msgid "About" msgstr "אודות" -#: converter.py:169 +#: converter.py:194 msgid "Choose destination folder" msgstr "בחר תיקיית יעד" -#: converter.py:162 +#: converter.py:187 msgid "Choose source folder" msgstr "בחר תיקיית מקור" -#: converter.py:112 +#: converter.py:130 msgid "Convert" msgstr "המר" -#: converter.py:135 +#: converter.py:156 msgid "Convert to DNG" msgstr "המר ל-DNG" -#: converter.py:134 +#: converter.py:155 msgid "Convert to TIFF" msgstr "המר ל-TIFF" -#: converter.py:111 +#: converter.py:158 +msgid "Create thumbnail (needed by some editors e.g. darktable)" +msgstr "ייצר thumbnail (דרוש ע\"י תוכנות מסוימות כגון darktable )" + +#: converter.py:128 msgid "DNG" msgstr "" -#: converter.py:109 +#: converter.py:126 msgid "Destination folder" msgstr "תיקיית יעד" -#: converter.py:97 +#: converter.py:113 msgid "E&xit\tCtrl-Q" msgstr "&יציאה\tCTRL-Q" -#: converter.py:179 converter.py:198 +#: converter.py:204 converter.py:226 msgid "Error!" msgstr "שגיאה!" -#: converter.py:97 +#: converter.py:113 msgid "Exit" msgstr "יציאה" -#: converter.py:179 +#: converter.py:204 msgid "Must select at least one output format (DNG/TIFF)" msgstr "יש לבחור לפחות פורמט אחד (DNG/TIFF)" -#: converter.py:198 +#: converter.py:226 msgid "Must select source folder" msgstr "תיקיית מקור לא נבחרה" -#: converter.py:131 +#: converter.py:152 msgid "SJCAM RAW Converter" msgstr "ממיר SJCAM RAW" -#: converter.py:107 +#: converter.py:124 msgid "Source folder" msgstr "תיקיית מקור" -#: converter.py:57 +#: converter.py:73 msgid "Starting conversion" msgstr "מתחיל המרה" -#: converter.py:110 +#: converter.py:127 msgid "TIFF" msgstr "" +#: converter.py:129 +msgid "Thumbnail" +msgstr "" + #~ msgid "Convert to TIFF as well as DNG" #~ msgstr "המר ל-TIFF בנוסף ל-DNG" diff --git a/gui/locale/messages.pot b/gui/locale/messages.pot index 6fa05b5..ce9571c 100644 --- a/gui/locale/messages.pot +++ b/gui/locale/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-11-09 15:03+0200\n" +"POT-Creation-Date: 2017-04-13 17:17+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,86 +17,94 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: converter.py:101 +#: converter.py:117 msgid "&About" msgstr "" -#: converter.py:99 +#: converter.py:115 msgid "&File" msgstr "" -#: converter.py:103 +#: converter.py:119 msgid "&Help" msgstr "" -#: converter.py:114 +#: converter.py:132 msgid "Abort" msgstr "" -#: converter.py:40 converter.py:101 +#: converter.py:42 converter.py:117 msgid "About" msgstr "" -#: converter.py:169 +#: converter.py:194 msgid "Choose destination folder" msgstr "" -#: converter.py:162 +#: converter.py:187 msgid "Choose source folder" msgstr "" -#: converter.py:112 +#: converter.py:130 msgid "Convert" msgstr "" -#: converter.py:135 +#: converter.py:156 msgid "Convert to DNG" msgstr "" -#: converter.py:134 +#: converter.py:155 msgid "Convert to TIFF" msgstr "" -#: converter.py:111 +#: converter.py:158 +msgid "Create thumbnail (needed by some editors e.g. darktable)" +msgstr "" + +#: converter.py:128 msgid "DNG" msgstr "" -#: converter.py:109 +#: converter.py:126 msgid "Destination folder" msgstr "" -#: converter.py:97 +#: converter.py:113 msgid "E&xit\tCtrl-Q" msgstr "" -#: converter.py:179 converter.py:198 +#: converter.py:204 converter.py:226 msgid "Error!" msgstr "" -#: converter.py:97 +#: converter.py:113 msgid "Exit" msgstr "" -#: converter.py:179 +#: converter.py:204 msgid "Must select at least one output format (DNG/TIFF)" msgstr "" -#: converter.py:198 +#: converter.py:226 msgid "Must select source folder" msgstr "" -#: converter.py:131 +#: converter.py:152 msgid "SJCAM RAW Converter" msgstr "" -#: converter.py:107 +#: converter.py:124 msgid "Source folder" msgstr "" -#: converter.py:57 +#: converter.py:73 msgid "Starting conversion" msgstr "" -#: converter.py:110 +#: converter.py:127 msgid "TIFF" msgstr "" + +#: converter.py:129 +msgid "Thumbnail" +msgstr "" diff --git a/gui/locale/ru/LC_MESSAGES/converter.mo b/gui/locale/ru/LC_MESSAGES/converter.mo index 500a2581e2d622ab829cebde02a164f338fb3cd8..d0ee32be2ba44dbab152fdc8766e2b22c59fd71d 100644 GIT binary patch delta 738 zcmYk&J!n%=6u|MDG__i7qpb?HiWhWf)g&*il2CLIKUT%TNh*oCXlR;15(NcGs5pp1 z!76Sl4lWKxV?(iRy13|c-ry=a2o8QANCzkX=b0fF&imc_IPctZ-q(T0(b}h>$V0>0 zLF^{p5qpS2hzIL4Zon_ti{Co_?D(hSUmVd7!p3ZeUD$^S9K;kx@ieCKJPsLCGxKb= z@ZuTjMK3XeEllDvYT+L^jD0=E4B#m0c^n^c`7zwd`6C~1!tbbg>!=My=w62$!8j)H z0QZ||Hahto+=tI`KYqXx{=&U@k?!c&)KClG$9{Z@m+%E@!%@c8ddG1Tr%~(PK>7@t zgJ9Uf3v6gG_yY_W6xMDx61w!4aer{Jo~aQmh7B&?hMNhUtb1+cFud?SbTfUT>@rnn zt5>ehW{a78!HyN3%ekD*UbmIftg|kcua?Rc>*AN=HkT>SR5RIv8(%mT{(U4B^A5+7 zlQx-}n(z*Klb+Xq_Dt-YyOyuyOU2kpDo@!7FWH@!ZqD=^4c8t>TV6>+Udxg{=ilpY zKvw-*(vnqaTX`eP{=8+sC~u|h&k=S1u7BIgnqQ|xlV?L#WaW@1HU7U|;>Dt0@9Ngb R6VleGK?-@&Z1pBW{{W(VnrQ$4 delta 513 zcmYk&ze@sP7{Kx8?##?I^~xYp3<`w8xD%9=h^D6IASeiewwCsgwuZprh_;q~Y)!fq zL5s6CC%6i=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: converter.py:101 +#: converter.py:117 msgid "&About" msgstr "&О программе" -#: converter.py:99 +#: converter.py:115 msgid "&File" msgstr "&Фаил" -#: converter.py:103 +#: converter.py:119 msgid "&Help" msgstr "&Помошь" -#: converter.py:114 +#: converter.py:132 msgid "Abort" msgstr "Остановить" -#: converter.py:40 converter.py:101 +#: converter.py:42 converter.py:117 msgid "About" msgstr "О программе" -#: converter.py:169 +#: converter.py:194 msgid "Choose destination folder" msgstr "Выбрать папку назначения" -#: converter.py:162 +#: converter.py:187 msgid "Choose source folder" msgstr "Выбрать папку источник" -#: converter.py:112 +#: converter.py:130 msgid "Convert" msgstr "Конвертировать" -#: converter.py:135 +#: converter.py:156 msgid "Convert to DNG" msgstr "Конвертировать в DNG" -#: converter.py:134 +#: converter.py:155 msgid "Convert to TIFF" msgstr "Конвертировать в TIFF" -#: converter.py:111 +#: converter.py:158 +msgid "Create thumbnail (needed by some editors e.g. darktable)" +msgstr "" +"Добавить thumbnail (нужно для некоторых программ, на пример darktable)" + +#: converter.py:128 msgid "DNG" msgstr "" -#: converter.py:109 +#: converter.py:126 msgid "Destination folder" msgstr "Папка назначения" -#: converter.py:97 +#: converter.py:113 msgid "E&xit\tCtrl-Q" msgstr "&Выход\tCTRL-Q" -#: converter.py:179 converter.py:198 +#: converter.py:204 converter.py:226 msgid "Error!" msgstr "Ошибка!" -#: converter.py:97 +#: converter.py:113 msgid "Exit" msgstr "Выход" -#: converter.py:179 +#: converter.py:204 msgid "Must select at least one output format (DNG/TIFF)" msgstr "Необходимо выбрать хотя бы один выходной формат (DNG/TIFF)" -#: converter.py:198 +#: converter.py:226 msgid "Must select source folder" msgstr "Папка источник не выбранна" -#: converter.py:131 +#: converter.py:152 msgid "SJCAM RAW Converter" msgstr "Конвертер SJCAM RAW" -#: converter.py:107 +#: converter.py:124 msgid "Source folder" msgstr "Папка источник" -#: converter.py:57 +#: converter.py:73 msgid "Starting conversion" msgstr "Конверсия началась" -#: converter.py:110 +#: converter.py:127 msgid "TIFF" msgstr "" +#: converter.py:129 +msgid "Thumbnail" +msgstr "" + #~ msgid "Convert to TIFF as well as DNG" #~ msgstr "Конвертировать в TIFF в добавок к DNG"