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

Timestamp:

Feb 1, 2018, 2:54:11 PM (3 years ago)

Author:

Juanma

Message:

WIP oin experte mode

File:

• taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/DetailBox.py (modified) (10 diffs)

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

@@ -168 +168 @@
                 self.month_box.add(Gtk.Label(_("Month")))
                 self.month_box.add(self.cmb_months)
-                self.hour_box=Gtk.Box()
-                self.hour_box.set_homogeneous(True)
+                self.hour_box=Gtk.Box(spacing=WIDGET_MARGIN)
+                self.hour_box.set_homogeneous(False)
                 self.cmb_hours=Gtk.ComboBoxText()
 #               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.spin_hour=Gtk.SpinButton()
+                self.spin_hour.set_range(0,23)
+                self.spin_hour.set_increments(1,1)
+                self.spin_hour.set_wrap(True)
+                self.spin_hour.set_orientation(Gtk.Orientation.VERTICAL)
+                self.spin_hour.set_valign(Gtk.Align.CENTER)
+                self.spin_hour.set_halign(Gtk.Align.CENTER)
+                self.spin_hour.set_vexpand(False)
+                self.spin_min=Gtk.SpinButton()
+                self.spin_min.set_range(0,59)
+                self.spin_min.set_increments(1,1)
+                self.spin_min.set_wrap(True)
+                self.spin_min.set_orientation(Gtk.Orientation.VERTICAL)
+                self.spin_min.set_valign(Gtk.Align.CENTER)
+                self.spin_min.set_halign(Gtk.Align.CENTER)
+                self.spin_min.set_vexpand(False)
+                self.hour_box.add(self.spin_hour)
                 self.hour_box.add(Gtk.Label(":"))
-                self.hour_box.add(spin_min)
+                self.minute_box=Gtk.Box()
+                self.minute_box.add(self.spin_min)
+                self.time_box=Gtk.Box(spacing=WIDGET_MARGIN)
+                self.time_box.add(self.hour_box)
+                self.time_box.add(self.minute_box)
                 ####REM
-                self.minute_box=Gtk.Box()
 #               self.minute_box.set_homogeneous(True)
                 self.cmb_minutes=Gtk.ComboBoxText()
@@ -212 +215 @@
                 dow_frame=Gtk.Frame()
                 dow_frame.set_shadow_type(Gtk.ShadowType.OUT)
-                frame_box=Gtk.Box(orientation=Gtk.Orientation.VERTICAL,spacing=6)
+                frame_box=Gtk.Box(orientation=Gtk.Orientation.VERTICAL,spacing=WIDGET_MARGIN)
                 dow_frame.add(frame_box)
                 label=Gtk.Label(_("Days of week"))
@@ -244 +247 @@
                         labelCol=1
                         dowCol=0
+                        gtkGrid.set_column_spacing(WIDGET_MARGIN*5)
                         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)
+                        self.time_box.set_valign(Gtk.Align.CENTER)
+                        self.time_box.set_halign(Gtk.Align.CENTER)
+                        self.time_box.set_margin_bottom(WIDGET_MARGIN)
+                        gtkGrid.attach_next_to(self.time_box,label,Gtk.PositionType.BOTTOM,1,2)
 #                       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.month_box,self.time_box,Gtk.PositionType.BOTTOM,1,1)
                         gtkGrid.attach_next_to(self.day_box,self.month_box,Gtk.PositionType.BOTTOM,1,1)
                         label=Gtk.Label(_("Time intervals"))
@@ -261 +268 @@
                 else:
                         label.set_text(_("Time"))
+                        gtkGrid.set_column_spacing(WIDGET_MARGIN*10)
                         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,3)
+                        gtkGrid.attach_next_to(self.time_box,label,Gtk.PositionType.BOTTOM,1,4)
 #                       gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.RIGHT,1,1)
-                        gtkGrid.set_row_homogeneous(True)
+#                       gtkGrid.set_row_homogeneous(True)
 
                 if btn_apply:
@@ -307 +315 @@
                 self.cmb_handler[self.cmb_months]=self.cmb_months.connect("changed",self._parse_scheduled)
                 self.cmb_handler[self.cmb_days]=self.cmb_days.connect("changed",self._parse_scheduled)
-                self.cmb_handler[self.cmb_hours]=self.cmb_hours.connect("changed",self._parse_scheduled)
-                self.cmb_handler[self.cmb_minutes]=self.cmb_minutes.connect("changed",self._parse_scheduled)
+#               self.cmb_handler[self.cmb_hours]=self.cmb_hours.connect("changed",self._parse_scheduled)
+                self.cmb_handler[self.spin_hour]=self.spin_hour.connect("changed",self._parse_scheduled)
+#               self.cmb_handler[self.cmb_minutes]=self.cmb_minutes.connect("changed",self._parse_scheduled)
+                self.cmb_handler[self.spin_min]=self.spin_min.connect("changed",self._parse_scheduled)
                 gtkGrid.connect("event",self._parse_scheduled)
                 self.chk_node.connect("toggled",self._enable_expert_mode,gtkGrid,btn_apply)
@@ -315 +325 @@
                 self.interval_box.set_sensitive(False)
                 #signals
+#               gtkGrid.set_valign(Gtk.Align.CENTER)
+#               gtkGrid.set_halign(Gtk.Align.CENTER)
                 return (gtkGrid)
         #def render_form
@@ -339 +351 @@
                 self.lbl_info.set_text('')
                 if task_data['m'].isdigit():
-                        cursor=0
-                        for minute in range(0,60,5):
-                                if minute>int(task_data['m']):
-                                        break
-                                cursor+=1
-                        self.cmb_minutes.set_active(cursor-1)
-                else:
-                        self.cmb_minutes.set_active(0)
-
-                self._parse_date_details(task_data['h'],self.cmb_hours,'hour')
+#                       self.cmb_minutes.set_active(cursor-1)
+                        self.spin_min.set_value(int(task_data['m']))
+                else:
+#                       self.cmb_minutes.set_active(0)
+                        self.spin_min.set_value(0)
+
+                if task_data['h'].isdigit():
+                        self.spin_hour.set_value(int(task_data['h']))
+                else:
+#                       self.cmb_minutes.set_active(0)
+                        self._parse_date_details(task_data['h'],None,'hour')
+
+#               self._parse_date_details(task_data['h'],self.cmb_hours,'hour')
                 self._parse_date_details(task_data['dom'],self.cmb_days,'dom')
                 self._parse_date_details(task_data['mon'],self.cmb_months,'mon')
@@ -369 +384 @@
                         self.cmb_interval.set_active(int(pos[1])-1)
                         if date_type=='hour':
-                                self.cmb_dates.set_active(0)
+                                self.spin_hour.set_value(0)
+#                               self.cmb_dates.set_active(0)
                                 self.hour_box.set_sensitive(False)
                         elif date_type=='dom':
@@ -397 +413 @@
                 for widget in widgets:
                         widget.set_active(False)
-                self.cmb_hours.set_active(0)
-                self.cmb_minutes.set_active(0)
+#               self.cmb_hours.set_active(0)
+                self.spin_hour.set_value(0)
+#               self.cmb_minutes.set_active(0)
+                self.spin_min.set_value(0)
                 self.cmb_days.set_active(0)
                 self.cmb_months.set_active(0)
@@ -517 +535 @@
                         details[i]="*"
                 #load data
-                if self.cmb_hours.is_sensitive():
-                        details["h"]=self.cmb_hours.get_active_text()
-                if self.cmb_minutes.is_sensitive():
-                        details["m"]=self.cmb_minutes.get_active_text()
+#               if self.cmb_hours.is_sensitive():
+                if self.spin_hour.is_sensitive():
+#                       details["h"]=self.spin_hours.get_active_text()
+                        details["h"]=str(self.spin_hour.get_value_as_int())
+#               if self.cmb_minutes.is_sensitive():
+                if self.spin_min.is_sensitive():
+#                       details["m"]=self.cmb_minutes.get_active_text()
+                        details["m"]=str(self.spin_min.get_value_as_int())
                 if self.cmb_months.is_sensitive():
                         if self.cmb_months.get_active()>0: