Changeset 6718
- Timestamp:
- Jan 29, 2018, 2:31:08 PM (3 years ago)
- Location:
- taskscheduler/trunk/fuentes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
taskscheduler/trunk/fuentes/python3-taskscheduler.install/usr/share/taskscheduler/cronParser.py
r6269 r6718 26 26 parsed_calendar='' 27 27 expr={} 28 day_dict={'1':_('Monday'),'2':_('Tuesday'),'3':_('Wednesday'),'4':_('Thursday'),'5':_('Friday'),\ 29 '6':_('Saturday'),'7':_('Sunday'),'*':'every'} 30 mon_dict={'1':_('January'),'2':_('February'),'3':_('March'),'4':_('April'),'5':_('May'),\ 31 '6':_('June'),'7':_('July'),'8':_('August'),'9':_('September'),'10':_('October'),\ 32 '11':_('November'),'12':_('December'),'*':'every'} 28 # day_dict={'1':_('Monday'),'2':_('Tuesday'),'3':_('Wednesday'),'4':_('Thursday'),'5':_('Friday'),\ 29 # '6':_('Saturday'),'7':_('Sunday'),'*':'every'} 30 day_dict={'1':_('Mon'),'2':_('Tue'),'3':_('Wed'),'4':_('Thu'),'5':_('Fri'),\ 31 '6':_('Sat'),'7':_('Sun'),'*':'every'} 32 # mon_dict={'1':_('January'),'2':_('February'),'3':_('March'),'4':_('April'),'5':_('May'),\ 33 # '6':_('June'),'7':_('July'),'8':_('August'),'9':_('September'),'10':_('October'),\ 34 # '11':_('November'),'12':_('December'),'*':'every'} 35 mon_dict={'1':_('Jan'),'2':_('Feb'),'3':_('Mar'),'4':_('Apr'),'5':_('May'),\ 36 '6':_('Jun'),'7':_('Jul'),'8':_('Aug'),'9':_('Sep'),'10':_('Oct'),\ 37 '11':_('Nov'),'12':_('Dec'),'*':'every'} 33 38 mon_expr=self._parse_cron_expression(taskData['mon'],mon_dict) 34 39 dow_expr=self._parse_cron_expression(taskData['dow'],day_dict) -
taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/DetailBox.py
r6700 r6718 178 178 179 179 self.lbl_info=Gtk.Label("") 180 self.lbl_info.set_line_wrap(True) 181 self.lbl_info.set_max_width_chars(20) 182 self.lbl_info.set_width_chars(20) 180 183 self.lbl_info.set_opacity(0.6) 181 184 gtkGrid.attach(self.lbl_info,0,0,4,1) … … 198 201 work_days_box.add(self.chk_thursday) 199 202 work_days_box.add(self.chk_friday) 200 work_days_box.set_focus_chain([self.chk_monday,self.chk_tuesday,self.chk_wednesday,self.chk_thursday,\ 201 self.chk_friday]) 203 work_days_box.set_focus_chain([self.chk_monday,self.chk_tuesday,self.chk_wednesday,self.chk_thursday,self.chk_friday]) 202 204 dow_box.add(work_days_box) 203 205 weekend_days_box=Gtk.Box(orientation=Gtk.Orientation.VERTICAL) … … 208 210 dow_box.set_focus_chain([work_days_box,weekend_days_box]) 209 211 frame_box.add(dow_box) 210 gtkGrid.attach(dow_frame,0,1,1,6) 211 label=Gtk.Label(_("Time & date")) 212 label=Gtk.Label() 212 213 label.set_margin_bottom(WIDGET_MARGIN) 213 gtkGrid.attach(label,1,1,1,1)214 gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,1)215 gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.BOTTOM,1,1)216 214 self.interval_box=Gtk.Box() 217 215 if self.expert_mode: 216 label.set_text(_("Time & date")) 217 minBoxPos=Gtk.PositionType.BOTTOM 218 labelCol=1 219 dowCol=0 220 gtkGrid.attach(dow_frame,0,1,1,6) 221 gtkGrid.attach(label,1,1,1,1) 222 gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,1) 223 gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.BOTTOM,1,1) 218 224 gtkGrid.attach_next_to(self.month_box,self.minute_box,Gtk.PositionType.BOTTOM,1,1) 219 225 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) 228 234 gtkGrid.attach_next_to(self.chk_special_dates,self.interval_box,Gtk.PositionType.BOTTOM,1,1) 235 else: 236 label.set_text(_("Time")) 237 gtkGrid.attach(dow_frame,1,1,1,6) 238 gtkGrid.attach(label,2,1,1,1) 239 gtkGrid.attach_next_to(self.hour_box,label,Gtk.PositionType.BOTTOM,1,1) 240 gtkGrid.attach_next_to(self.minute_box,self.hour_box,Gtk.PositionType.RIGHT,1,1) 229 241 230 242 if btn_apply: … … 236 248 self.btn_mode.set_halign(Gtk.Align.START) 237 249 self.btn_mode.set_valign(Gtk.Align.START) 238 gtkGrid.attach(self.btn_mode,0,7, 2,1)250 gtkGrid.attach(self.btn_mode,0,7,1,1) 239 251 self.btn_mode.set_label("Advanced") 240 252 self.btn_mode.set_active(self.expert_mode) … … 281 293 def _enable_expert_mode(self,widget,gtkgrid,btn_apply): 282 294 self.expert_mode=self.btn_mode.get_active() 283 print("Expert mode: %s"%self.expert_mode)284 295 for grid_widget in gtkgrid.get_children(): 285 296 gtkgrid.remove(grid_widget) … … 289 300 parent.add(gtkgrid) 290 301 parent.show_all() 291 print("%s"%type(gtkgrid))292 print("%s"%type(parent))293 302 294 303 … … 512 521 def _parse_scheduled(self,container=None,widget=None): 513 522 details=self._parse_screen() 514 self.lbl_info.set_text( "Task schedule: "+(self.parser.parse_taskData(details)))523 self.lbl_info.set_text(self.parser.parse_taskData(details)) 515 524 #def _parse_scheduled 516 525 -
taskscheduler/trunk/fuentes/scheduler-gui.install/usr/share/taskscheduler/bin/taskScheduler.py
r6552 r6718 141 141 self.toolbar.props.no_show_all=True 142 142 self.window.connect("destroy",self.quit) 143 self.window.set_resizable(False) 143 144 self.window.show_all() 144 145 self.inf_message.hide()
Note: See TracChangeset
for help on using the changeset viewer.