Skip to content

Commit

Permalink
gui: Add thumbnail option
Browse files Browse the repository at this point in the history
Signed-off-by: Yan Burman <yanburman@users.noreply.github.com>
  • Loading branch information
yanburman committed Apr 13, 2017
1 parent 2b554db commit 9e10625
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 94 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 7 additions & 1 deletion gui/converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -212,6 +215,9 @@ def OnConvert(self, event): # wxGlade: MainFrame.<event_handler>
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())
Expand Down
12 changes: 10 additions & 2 deletions gui/converter.wxg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<!-- generated by wxGlade 0.7.1 on Sun Feb 19 15:40:11 2017 -->
<!-- generated by wxGlade 0.7.1 on Thu Apr 13 17:09:15 2017 -->

<application class="" encoding="UTF-8" for_version="3.0" header_extension=".h" indent_amount="4" indent_symbol="space" is_template="0" language="python" name="" option="0" overwrite="0" path="converter.py" source_extension=".cpp" top_window="main_frame" use_gettext="1" use_new_namespace="1">
<object class="MainFrame" name="main_frame" base="EditFrame">
Expand Down Expand Up @@ -99,7 +99,7 @@
<object class="wxGridSizer" name="grid_sizer_2" base="EditGridSizer">
<hgap>0</hgap>
<rows>1</rows>
<cols>2</cols>
<cols>3</cols>
<vgap>0</vgap>
<object class="sizeritem">
<border>0</border>
Expand All @@ -118,6 +118,14 @@
<tooltip>Convert to DNG</tooltip>
</object>
</object>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="thumb_checkbox" base="EditCheckBox">
<label>Thumbnail</label>
<tooltip>Create thumbnail (needed by some editors e.g. darktable)</tooltip>
</object>
</object>
</object>
</object>
<object class="sizeritem">
Expand Down
Binary file modified gui/locale/en/LC_MESSAGES/converter.mo
Binary file not shown.
54 changes: 31 additions & 23 deletions gui/locale/en/LC_MESSAGES/converter.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 ""
Binary file modified gui/locale/he/LC_MESSAGES/converter.mo
Binary file not shown.
54 changes: 31 additions & 23 deletions gui/locale/he/LC_MESSAGES/converter.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Loading

0 comments on commit 9e10625

Please sign in to comment.