Skip to content

Commit 7ff07b1

Browse files
hansuhansu
committed
gmoccapy: add toggle button + setting for sort by date
1 parent 2dec959 commit 7ff07b1

File tree

2 files changed

+189
-17
lines changed

2 files changed

+189
-17
lines changed

‎src/emc/usr_intf/gmoccapy/gmoccapy.glade‎

Lines changed: 145 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<signal name="value-changed" handler="on_adj_width_popup_value_changed" swapped="no"/>
152152
</object>
153153
<object class="GtkAdjustment" id="adj_x_pos">
154-
<property name="upper">1024</property>
154+
<property name="upper">2500</property>
155155
<property name="value">40</property>
156156
<property name="step-increment">1</property>
157157
<signal name="value-changed" handler="on_adj_x_pos_value_changed" swapped="no"/>
@@ -4959,8 +4959,8 @@ to test your settings.</property>
49594959
<object class="GtkBox" id="hbox_setup_behaviour">
49604960
<property name="visible">True</property>
49614961
<property name="can-focus">False</property>
4962-
<property name="margin-start">5</property>
4963-
<property name="margin-end">5</property>
4962+
<property name="margin-start">3</property>
4963+
<property name="margin-end">3</property>
49644964
<property name="margin-top">3</property>
49654965
<property name="margin-bottom">3</property>
49664966
<property name="spacing">5</property>
@@ -4969,6 +4969,7 @@ to test your settings.</property>
49694969
<property name="visible">True</property>
49704970
<property name="can-focus">False</property>
49714971
<property name="orientation">vertical</property>
4972+
<property name="spacing">5</property>
49724973
<child>
49734974
<object class="GtkFrame" id="frm_keyboard">
49744975
<property name="visible">True</property>
@@ -5349,6 +5350,7 @@ to test your settings.</property>
53495350
<property name="visible">True</property>
53505351
<property name="can-focus">False</property>
53515352
<property name="orientation">vertical</property>
5353+
<property name="spacing">5</property>
53525354
<child>
53535355
<object class="GtkFrame" id="frm_file_to_load">
53545356
<property name="visible">True</property>
@@ -5476,6 +5478,129 @@ to test your settings.</property>
54765478
<property name="position">1</property>
54775479
</packing>
54785480
</child>
5481+
<child>
5482+
<object class="GtkFrame" id="frm_iconview">
5483+
<property name="visible">True</property>
5484+
<property name="can-focus">False</property>
5485+
<property name="label-xalign">0.5</property>
5486+
<child>
5487+
<object class="GtkBox" id="vbox_iconview_sort">
5488+
<property name="visible">True</property>
5489+
<property name="can-focus">False</property>
5490+
<property name="margin-start">3</property>
5491+
<property name="margin-end">3</property>
5492+
<property name="margin-top">3</property>
5493+
<property name="margin-bottom">3</property>
5494+
<property name="orientation">vertical</property>
5495+
<property name="spacing">5</property>
5496+
<child>
5497+
<object class="GtkLabel" id="lbl_sortorder">
5498+
<property name="visible">True</property>
5499+
<property name="can-focus">False</property>
5500+
<property name="halign">start</property>
5501+
<property name="label" translatable="yes">Sort order by name</property>
5502+
</object>
5503+
<packing>
5504+
<property name="expand">False</property>
5505+
<property name="fill">True</property>
5506+
<property name="position">0</property>
5507+
</packing>
5508+
</child>
5509+
<child>
5510+
<object class="GtkComboBoxText" id="cmb_sortorder">
5511+
<property name="visible">True</property>
5512+
<property name="can-focus">False</property>
5513+
<property name="active">0</property>
5514+
<items>
5515+
<item id="0" translatable="yes">Ascending</item>
5516+
<item id="1" translatable="yes">Descending</item>
5517+
</items>
5518+
<signal name="changed" handler="on_sortorder_changed" swapped="no"/>
5519+
</object>
5520+
<packing>
5521+
<property name="expand">False</property>
5522+
<property name="fill">True</property>
5523+
<property name="position">1</property>
5524+
</packing>
5525+
</child>
5526+
<child>
5527+
<object class="GtkLabel" id="lbl_sortbydate">
5528+
<property name="visible">True</property>
5529+
<property name="can-focus">False</property>
5530+
<property name="halign">start</property>
5531+
<property name="label" translatable="yes">Sort order by date </property>
5532+
</object>
5533+
<packing>
5534+
<property name="expand">False</property>
5535+
<property name="fill">True</property>
5536+
<property name="position">2</property>
5537+
</packing>
5538+
</child>
5539+
<child>
5540+
<object class="GtkComboBoxText" id="cmb_sortbydate">
5541+
<property name="visible">True</property>
5542+
<property name="can-focus">False</property>
5543+
<property name="active">1</property>
5544+
<items>
5545+
<item id="1" translatable="yes">Ascending</item>
5546+
<item id="2" translatable="yes">Descending</item>
5547+
</items>
5548+
<signal name="changed" handler="on_sortorder_date_changed" swapped="no"/>
5549+
</object>
5550+
<packing>
5551+
<property name="expand">False</property>
5552+
<property name="fill">True</property>
5553+
<property name="position">3</property>
5554+
</packing>
5555+
</child>
5556+
<child>
5557+
<object class="GtkLabel" id="lbl_sort_folders">
5558+
<property name="visible">True</property>
5559+
<property name="can-focus">False</property>
5560+
<property name="halign">start</property>
5561+
<property name="label" translatable="yes">Separate folders/files</property>
5562+
</object>
5563+
<packing>
5564+
<property name="expand">False</property>
5565+
<property name="fill">True</property>
5566+
<property name="position">4</property>
5567+
</packing>
5568+
</child>
5569+
<child>
5570+
<object class="GtkComboBoxText" id="cmb_folderfirst">
5571+
<property name="visible">True</property>
5572+
<property name="can-focus">False</property>
5573+
<property name="active">0</property>
5574+
<items>
5575+
<item id="0" translatable="yes">Folders first</item>
5576+
<item id="1" translatable="yes">Files first</item>
5577+
<item id="2" translatable="yes">None</item>
5578+
</items>
5579+
<signal name="changed" handler="on_folderfirst_changed" swapped="no"/>
5580+
</object>
5581+
<packing>
5582+
<property name="expand">False</property>
5583+
<property name="fill">True</property>
5584+
<property name="position">5</property>
5585+
</packing>
5586+
</child>
5587+
</object>
5588+
</child>
5589+
<child type="label">
5590+
<object class="GtkLabel">
5591+
<property name="visible">True</property>
5592+
<property name="can-focus">False</property>
5593+
<property name="label" translatable="yes">&lt;b&gt;File and folder list&lt;/b&gt;</property>
5594+
<property name="use-markup">True</property>
5595+
</object>
5596+
</child>
5597+
</object>
5598+
<packing>
5599+
<property name="expand">False</property>
5600+
<property name="fill">True</property>
5601+
<property name="position">2</property>
5602+
</packing>
5603+
</child>
54795604
</object>
54805605
<packing>
54815606
<property name="expand">False</property>
@@ -8031,6 +8156,22 @@ tool z</property>
80318156
<property name="position">5</property>
80328157
</packing>
80338158
</child>
8159+
<child>
8160+
<object class="GtkToggleButton" id="tbtn_sort">
8161+
<property name="label" translatable="yes">Sort by
8162+
date</property>
8163+
<property name="visible">True</property>
8164+
<property name="can-focus">True</property>
8165+
<property name="receives-default">True</property>
8166+
<property name="tooltip-text" translatable="yes">Sort files by date, newest first</property>
8167+
<signal name="toggled" handler="on_tbtn_sort_toggled" swapped="no"/>
8168+
</object>
8169+
<packing>
8170+
<property name="expand">True</property>
8171+
<property name="fill">True</property>
8172+
<property name="position">6</property>
8173+
</packing>
8174+
</child>
80348175
<child>
80358176
<object class="GtkLabel" id="lbl_space_11">
80368177
<property name="width-request">90</property>
@@ -8041,7 +8182,7 @@ tool z</property>
80418182
<packing>
80428183
<property name="expand">False</property>
80438184
<property name="fill">False</property>
8044-
<property name="position">6</property>
8185+
<property name="position">7</property>
80458186
</packing>
80468187
</child>
80478188
<child>
@@ -8059,19 +8200,6 @@ tool z</property>
80598200
<property name="image-position">top</property>
80608201
<signal name="clicked" handler="on_btn_select_clicked" swapped="no"/>
80618202
</object>
8062-
<packing>
8063-
<property name="expand">False</property>
8064-
<property name="fill">False</property>
8065-
<property name="position">7</property>
8066-
</packing>
8067-
</child>
8068-
<child>
8069-
<object class="GtkLabel" id="lbl_space_12">
8070-
<property name="width-request">90</property>
8071-
<property name="height-request">56</property>
8072-
<property name="visible">True</property>
8073-
<property name="can-focus">False</property>
8074-
</object>
80758203
<packing>
80768204
<property name="expand">False</property>
80778205
<property name="fill">False</property>

‎src/emc/usr_intf/gmoccapy/gmoccapy.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,6 +2484,21 @@ def _init_IconFileSelection(self):
24842484
filetypes += ext.replace("*.", "") + ","
24852485
self.widgets.IconFileSelection1.set_property("filetypes", filetypes)
24862486

2487+
self.iconview_sortorder = self.prefs.getpref("iconview_sortorder", 0, int)
2488+
self.iconview_sortbydate = self.prefs.getpref("iconview_sortbydate", 1, int)
2489+
self.iconview_folderfirst = self.prefs.getpref("iconview_folderfirst", 0, int)
2490+
self.sort_by_date = self.prefs.getpref("sort_by_date", False, bool) # state of toggle button
2491+
self.widgets.tbtn_sort.set_active(self.sort_by_date)
2492+
self.widgets.cmb_sortorder.set_active_id(str(self.iconview_sortorder))
2493+
self.widgets.cmb_sortbydate.set_active_id(str(self.iconview_sortbydate))
2494+
self.widgets.cmb_folderfirst.set_active_id(str(self.iconview_folderfirst))
2495+
self.widgets.IconFileSelection1.set_property("sortorder", self.iconview_sortorder)
2496+
self.widgets.IconFileSelection1.set_property("folderfirst", self.iconview_folderfirst)
2497+
if self.sort_by_date:
2498+
self.widgets.IconFileSelection1.set_property("sortbydate", self.iconview_sortbydate)
2499+
else:
2500+
self.widgets.IconFileSelection1.set_property("sortbydate", 0)
2501+
24872502
jump_to_dir = self.prefs.getpref("jump_to_dir", os.path.expanduser("~"), str)
24882503
self.widgets.jump_to_dir_chooser.set_current_folder(jump_to_dir)
24892504
self.widgets.IconFileSelection1.set_property("jump_to_dir", jump_to_dir)
@@ -5389,6 +5404,27 @@ def on_cmb_mouse_button_mode_changed(self, widget):
53895404
index = widget.get_active()
53905405
self.widgets.gremlin.set_property("mouse_btn_mode", index)
53915406
self.prefs.putpref("mouse_btn_mode", index, int)
5407+
5408+
def on_sortorder_changed(self, widget):
5409+
id = int(widget.get_active_id())
5410+
self.iconview_sortorder = id
5411+
self.widgets.IconFileSelection1.set_property("sortorder", id)
5412+
self.prefs.putpref("iconview_sortorder", id)
5413+
5414+
def on_sortorder_date_changed(self, widget):
5415+
id = int(widget.get_active_id())
5416+
self.iconview_sortbydate = id
5417+
self.prefs.putpref("iconview_sortbydate", id)
5418+
if self.sort_by_date:
5419+
self.widgets.IconFileSelection1.set_property("sortbydate", self.iconview_sortbydate)
5420+
else:
5421+
self.widgets.IconFileSelection1.set_property("sortbydate", 0)
5422+
5423+
def on_folderfirst_changed(self, widget):
5424+
id = int(widget.get_active_id())
5425+
self.iconview_folderfirst = id
5426+
self.widgets.IconFileSelection1.set_property("folderfirst", id)
5427+
self.prefs.putpref("iconview_folderfirst", id)
53925428

53935429
# =========================================================
53945430
# tool stuff
@@ -5895,6 +5931,14 @@ def on_tbtn_switch_mode_toggled(self, widget, data=None):
58955931
self.widgets.tbtn_switch_mode.set_label(_("World\nmode"))
58965932
self._set_motion_mode(1)
58975933

5934+
def on_tbtn_sort_toggled(self, widget, data=None):
5935+
if widget.get_active():
5936+
self.widgets.IconFileSelection1.set_property("sortbydate", self.iconview_sortbydate)
5937+
else:
5938+
self.widgets.IconFileSelection1.set_property("sortbydate", 0)
5939+
self.sort_by_date = widget.get_active()
5940+
self.prefs.putpref("sort_by_date", self.sort_by_date)
5941+
58985942
def on_tbtn_split_view_toggled(self, widget, data=None):
58995943
if widget.get_active():
59005944
self.widgets.ntb_preview.show()

0 commit comments

Comments
 (0)