Changeset 6718

Timestamp:

Jan 29, 2018, 2:31:08 PM (3 years ago)

Author:

Juanma

Message:

WIP on basic mode

Location:

taskscheduler/trunk/fuentes

Files:

• python3-taskscheduler.install/usr/share/taskscheduler/cronParser.py (modified) (1 diff)
• scheduler-gui.install/usr/share/taskscheduler/bin/DetailBox.py (modified) (8 diffs)
• scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py (modified) (1 diff)

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

@@ -26 +26 @@
                 parsed_calendar=''
                 expr={}
-                day_dict={'1':_('Monday'),'2':_('Tuesday'),'3':_('Wednesday'),'4':_('Thursday'),'5':_('Friday'),\
-                                '6':_('Saturday'),'7':_('Sunday'),'*':'every'}
-                mon_dict={'1':_('January'),'2':_('February'),'3':_('March'),'4':_('April'),'5':_('May'),\
-                                '6':_('June'),'7':_('July'),'8':_('August'),'9':_('September'),'10':_('October'),\
-                                '11':_('November'),'12':_('December'),'*':'every'}
+#               day_dict={'1':_('Monday'),'2':_('Tuesday'),'3':_('Wednesday'),'4':_('Thursday'),'5':_('Friday'),\
+#                               '6':_('Saturday'),'7':_('Sunday'),'*':'every'}
+                day_dict={'1':_('Mon'),'2':_('Tue'),'3':_('Wed'),'4':_('Thu'),'5':_('Fri'),\
+                                '6':_('Sat'),'7':_('Sun'),'*':'every'}
+#               mon_dict={'1':_('January'),'2':_('February'),'3':_('March'),'4':_('April'),'5':_('May'),\
+#                               '6':_('June'),'7':_('July'),'8':_('August'),'9':_('September'),'10':_('October'),\
+#                               '11':_('November'),'12':_('December'),'*':'every'}
+                mon_dict={'1':_('Jan'),'2':_('Feb'),'3':_('Mar'),'4':_('Apr'),'5':_('May'),\
+                                '6':_('Jun'),'7':_('Jul'),'8':_('Aug'),'9':_('Sep'),'10':_('Oct'),\
+                                '11':_('Nov'),'12':_('Dec'),'*':'every'}
                 mon_expr=self._parse_cron_expression(taskData['mon'],mon_dict)
                 dow_expr=self._parse_cron_expression(taskData['dow'],day_dict)

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

@@ -178 +178 @@
 
                 self.lbl_info=Gtk.Label("")
+                self.lbl_info.set_line_wrap(True)
+                self.lbl_info.set_max_width_chars(20)
+                self.lbl_info.set_width_chars(20)
                 self.lbl_info.set_opacity(0.6)
                 gtkGrid.attach(self.lbl_info,0,0,4,1)
@@ -198 +201 @@
                 work_days_box.add(self.chk_thursday)
                 work_days_box.add(self.chk_friday)
-                work_days_box.set_focus_chain([self.chk_monday,self.chk_tuesday,self.chk_wednesday,self.chk_thursday,\
-                                                self.chk_friday])
+                work_days_box.set_focus_chain([self.chk_monday,self.chk_tuesday,self.chk_wednesday,self.chk_thursday,self.chk_friday])
                 dow_box.add(work_days_box)
                 weekend_days_box=Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
@@ -208 +210 @@
                 dow_box.set_focus_chain([work_days_box,weekend_days_box])
                 frame_box.add(dow_box)
-                gtkGrid.attach(dow_frame,0,1,1,6)
-                label=Gtk.Label(_("Time & date"))
+                label=Gtk.Label()
                 label.set_margin_bottom(WIDGET_MARGIN)
-                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)
                 self.interval_box=Gtk.Box()
                 if self.expert_mode:
+                        label.set_text(_("Time & date"))
+                        minBoxPos=Gtk.PositionType.BOTTOM
+                        labelCol=1
+                        dowCol=0
+                        gtkGrid.attach(dow_frame,0,1,1,6)
+                        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.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)
@@ -227 +233 @@
                         gtkGrid.attach_next_to(self.interval_box,self.chk_interval,Gtk.PositionType.BOTTOM,1,1)
                         gtkGrid.attach_next_to(self.chk_special_dates,self.interval_box,Gtk.PositionType.BOTTOM,1,1)
+                else:
+                        label.set_text(_("Time"))
+                        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)
 
                 if btn_apply:
@@ -236 +248 @@
                 self.btn_mode.set_halign(Gtk.Align.START)
                 self.btn_mode.set_valign(Gtk.Align.START)
-                gtkGrid.attach(self.btn_mode,0,7,2,1)
+                gtkGrid.attach(self.btn_mode,0,7,1,1)
                 self.btn_mode.set_label("Advanced")
                 self.btn_mode.set_active(self.expert_mode)
@@ -281 +293 @@
         def _enable_expert_mode(self,widget,gtkgrid,btn_apply):
                 self.expert_mode=self.btn_mode.get_active()
-                print("Expert mode: %s"%self.expert_mode)
                 for grid_widget in gtkgrid.get_children():
                         gtkgrid.remove(grid_widget)
@@ -289 +300 @@
                 parent.add(gtkgrid)
                 parent.show_all()
-                print("%s"%type(gtkgrid))
-                print("%s"%type(parent))
 
 
@@ -512 +521 @@
         def _parse_scheduled(self,container=None,widget=None):
                 details=self._parse_screen()
-                self.lbl_info.set_text("Task schedule: "+(self.parser.parse_taskData(details)))
+                self.lbl_info.set_text(self.parser.parse_taskData(details))
         #def _parse_scheduled
 

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

@@ -141 +141 @@
                 self.toolbar.props.no_show_all=True
                 self.window.connect("destroy",self.quit)
+                self.window.set_resizable(False)
                 self.window.show_all()
                 self.inf_message.hide()