Changeset 6742

Timestamp:

Jan 30, 2018, 2:00:03 PM (3 years ago)

Author:

Juanma

Message:

WIP in basic mode

Location:

taskscheduler/trunk/fuentes

Files:

• python3-taskscheduler.install/usr/share/taskscheduler/cronParser.py (modified) (2 diffs)
• scheduler-gui.install/usr/share/taskscheduler/bin/DetailBox.py (modified) (10 diffs)
• scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py (modified) (3 diffs)
• scheduler-gui.install/usr/share/taskscheduler/rsrc/taskScheduler.ui (modified) (6 diffs)

taskscheduler/trunk/fuentes/python3-taskscheduler.install/usr/share/taskscheduler/cronParser.py

@@ -138 +138 @@
                         if mon=='every' or mon =='*':
                                 if dow!='*' and dow!='every':
-                                        mon=self.expr['evweek']
+#                                       mon=self.expr['evweek']
+                                        mon=''
                                 else:
                                         mon=self.expr['evmon']
@@ -153 +154 @@
                                 time_expr="%s %s %s %s %s" % (self.expr['the'],dow,self.expr['in'],self.expr['evweek'],mon)
                         else:
-                                time_expr="%s %s %s %s" % (self.expr['the'],dow,self.expr['in'],mon)
+                                if mon!=self.expr['emon'] and mon!=self.expr['evmon'] and mon!='':
+                                        time_expr="%s %s %s %s" % (self.expr['the'],dow,self.expr['in'],mon)
+                                else:
+                                        time_expr="%s %s" % (self.expr['the'],dow)
                 else:
                         if dom==self.expr['eday'] and mon==self.expr['emon']:

taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/DetailBox.py

@@ -111 +111 @@
                 jump=0
                 time_units=0
+                months={}
                 if date_type=='hour':
                         time_units=24
@@ -123 +124 @@
                         inc=1
                         time_units=12
+                        months={1:'January',2:'February',3:'March',4:'April',5:'May',6:'June',7:'July',8:'August',9:'September',10:'October',11:'November',12:'December'}
                 elif date_type=='day':
                         widget=self.cmb_days
@@ -134 +136 @@
                                         widget.append_text(str(i+inc))
                         else:
-                                widget.append_text(str(i+inc))
+                                if months:
+                                        widget.append_text(months[(i+inc)])
+                                else:
+                                        widget.append_text(str(i+inc))
                 widget.set_active(0)
         #def _load_date_time_data
@@ -166 +171 @@
                 self.hour_box.set_homogeneous(True)
                 self.cmb_hours=Gtk.ComboBoxText()
-                self.hour_box.add(Gtk.Label(_("Hour")))
-                self.hour_box.add(self.cmb_hours)
+#               self.hour_box.add(Gtk.Label(_("Hour")))
+#               self.hour_box.add(self.cmb_hours)
+                ####REM
+                spin_hour=Gtk.SpinButton()
+                spin_hour.set_range(0,23)
+                spin_hour.set_increments(1,1)
+                spin_hour.set_wrap(True)
+                spin_hour.set_orientation(Gtk.Orientation.VERTICAL)
+                spin_hour.set_valign(Gtk.Align.START)
+                spin_hour.set_halign(Gtk.Align.START)
+                spin_hour.set_vexpand(False)
+                spin_min=Gtk.SpinButton()
+                spin_min.set_range(0,59)
+                spin_min.set_increments(1,1)
+                spin_min.set_wrap(True)
+                spin_min.set_orientation(Gtk.Orientation.VERTICAL)
+                spin_min.set_valign(Gtk.Align.START)
+                spin_min.set_halign(Gtk.Align.START)
+                spin_min.set_vexpand(False)
+                self.hour_box.add(spin_hour)
+                self.hour_box.add(Gtk.Label(":"))
+                self.hour_box.add(spin_min)
+                ####REM
                 self.minute_box=Gtk.Box()
-                self.minute_box.set_homogeneous(True)
+#               self.minute_box.set_homogeneous(True)
                 self.cmb_minutes=Gtk.ComboBoxText()
-                self.minute_box.add(Gtk.Label(_("Minutes")))
-                self.minute_box.add(self.cmb_minutes)
+#               self.minute_box.add(Gtk.Label(_("Minutes")))
+#               self.minute_box.add(self.cmb_minutes)
 
                 self._load_interval_data()
@@ -221 +247 @@
                         gtkGrid.attach(label,1,1,1,1)
                         gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,1)
-                        gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.BOTTOM,1,1)
+#                       gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.BOTTOM,1,1)
                         gtkGrid.attach_next_to(self.month_box,self.minute_box,Gtk.PositionType.BOTTOM,1,1)
                         gtkGrid.attach_next_to(self.day_box,self.month_box,Gtk.PositionType.BOTTOM,1,1)
@@ -237 +263 @@
                         gtkGrid.attach(dow_frame,1,1,1,6)
                         gtkGrid.attach(label,2,1,1,1)
-                        gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,1)
-                        gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.RIGHT,1,1)
+                        gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,3)
+#                       gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.RIGHT,1,1)
+                        gtkGrid.set_row_homogeneous(True)
 
                 if btn_apply:
@@ -244 +271 @@
                         self.btn_apply.set_valign(Gtk.Align.END)
                         gtkGrid.attach(self.btn_apply,4,7,2,1)
-                self.btn_mode=Gtk.CheckButton()
-                self.btn_mode.set_margin_top(12)
-                self.btn_mode.set_halign(Gtk.Align.START)
-                self.btn_mode.set_valign(Gtk.Align.START)
-                gtkGrid.attach(self.btn_mode,0,7,1,1)
-                self.btn_mode.set_label("Advanced")
-                self.btn_mode.set_active(self.expert_mode)
+                self.chk_node=Gtk.CheckButton()
+                self.chk_node.set_margin_top(12)
+                self.chk_node.set_halign(Gtk.Align.START)
+                self.chk_node.set_valign(Gtk.Align.START)
+                gtkGrid.attach(self.chk_node,0,7,1,1)
+                self.chk_node.set_label("Advanced")
+                self.chk_node.set_active(self.expert_mode)
 
                 #Tab order chain
@@ -283 +310 @@
                 self.cmb_handler[self.cmb_minutes]=self.cmb_minutes.connect("changed",self._parse_scheduled)
                 gtkGrid.connect("event",self._parse_scheduled)
-                self.btn_mode.connect("toggled",self._enable_expert_mode,gtkGrid,btn_apply)
+                self.chk_node.connect("toggled",self._enable_expert_mode,gtkGrid,btn_apply)
 
                 #Initial control status
@@ -292 +319 @@
 
         def _enable_expert_mode(self,widget,gtkgrid,btn_apply):
-                self.expert_mode=self.btn_mode.get_active()
+                self.expert_mode=self.chk_node.get_active()
                 for grid_widget in gtkgrid.get_children():
                         gtkgrid.remove(grid_widget)
@@ -495 +522 @@
                         details["m"]=self.cmb_minutes.get_active_text()
                 if self.cmb_months.is_sensitive():
-                        if self.cmb_months.get_active_text().isdigit():
-                                details["mon"]=self.cmb_months.get_active_text()
+                        if self.cmb_months.get_active()>0:
+                                details["mon"]=str(self.cmb_months.get_active())
                 if self.cmb_days.is_sensitive():
                         if self.cmb_days.get_active_text().isdigit():

taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py

@@ -164 +164 @@
                 self.task_details_grid.btn_apply.set_sensitive(True)
                 self.task_details_grid.btn_apply.connect("clicked",self.update_task)
+                self.task_details_grid.chk_node.connect("toggled",self._reload_grid)
                 self.tasks_store=Gtk.ListStore(str,str,str,GdkPixbuf.Pixbuf,str)
                 self.tasks_store_filter=self.tasks_store.filter_new()
@@ -540 +541 @@
         def _reload_grid(self,widget=None,data=None):
                 cursor=self.tasks_tv.get_cursor()[0]
+                self._debug("CURSOR %s"%widget)
                 if self.btn_remote_tasks.get_active():
                         task_type='remote'
@@ -547 +549 @@
                 self.populate_tasks_tv(task_type)
                 if cursor:
+                        self._debug("Restoring cursor")
                         self.tasks_tv.set_cursor(cursor)
+
+                if type(widget)==type(Gtk.CheckButton()):
+                        self.task_details_grid.chk_node.connect("toggled",self._reload_grid)
         #def _reload_grid
 

taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/rsrc/taskScheduler.ui

@@ -136 +136 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="valign">start</property>
             <property name="margin_left">5</property>
             <property name="margin_right">5</property>
+            <property name="vexpand">False</property>
           </object>
           <packing>
@@ -149 +151 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="valign">start</property>
             <property name="xpad">5</property>
             <property name="ypad">5</property>
@@ -164 +167 @@
             <property name="can_focus">False</property>
             <property name="valign">start</property>
-            <property name="vexpand">True</property>
+            <property name="vexpand">False</property>
           </object>
           <packing>
@@ -176 +179 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">center</property>
+            <property name="halign">start</property>
             <property name="valign">start</property>
-            <property name="vexpand">True</property>
+            <property name="hexpand">True</property>
             <property name="column_spacing">12</property>
             <child>
@@ -304 +307 @@
     <property name="opacity">0.98039215686274506</property>
     <property name="valign">start</property>
-    <property name="hexpand">True</property>
     <property name="resizable">False</property>
     <property name="window_position">center</property>
@@ -425 +427 @@
                         <property name="tooltip_text" translatable="yes">Search a task</property>
                         <property name="halign">end</property>
+                        <property name="margin_left">12</property>
                         <property name="hexpand">True</property>
                         <property name="primary_icon_name">edit-find-symbolic</property>