← Back to branch summary

~gnome15-team/gnome15/trunk

« back to all changes in this revision

Viewing changes to gnome15-plugins/src/cairo-clock/cairo-clock.py

  • Committer: tanktarta
  • Date: 2012-11-24 10:27:36 UTC
  • Revision ID: tanktarta-20121124102736-0drhasy3jdn862wx
0.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome15-plugins/src/cairo-clock/cairo-clock.py
100
100
        g15util.configure_checkbox_from_gconf(gconf_client, "%s/display_digital_time" % gconf_key, "DisplayDigitalTimeCheckbox", True, widget_tree)
101
101
        g15util.configure_checkbox_from_gconf(gconf_client, "%s/display_year" % gconf_key, "DisplayYearCheckbox", True, widget_tree)
102
102
        g15util.configure_checkbox_from_gconf(gconf_client, "%s/second_sweep" % gconf_key, "SecondSweep", False, widget_tree)
 
103
        g15util.configure_checkbox_from_gconf(gconf_client, "%s/twenty_four_hour_digital" % gconf_key, "TwentyFourHourDigitalCheckbox", True, widget_tree)
103
104
    
104
105
        e = gconf_client.get(gconf_key + "/theme")
105
106
        theme_name = "default"
183
184
        self.display_year = g15util.get_bool_or_default(self.gconf_client, "%s/display_year" % self.gconf_key, True)
184
185
        self.display_digital_time = g15util.get_bool_or_default(self.gconf_client, "%s/display_digital_time" % self.gconf_key, True)
185
186
        self.second_sweep = g15util.get_bool_or_default(self.gconf_client, "%s/second_sweep" % self.gconf_key, False)
 
187
        self.twenty_four_hour = g15util.get_bool_or_default(self.gconf_client, "%s/twenty_four_hour" % self.gconf_key, False)
 
188
        self.twenty_four_hour_digital = g15util.get_bool_or_default(self.gconf_client, "%s/twenty_four_hour_digital" % self.gconf_key, True)
 
189
        
 
190
        self.gconf_client.get_bool(self.gconf_key + "/twenty_four_hour")
186
191
        
187
192
        self.svg_size = None
188
193
        self.width = self.screen.width
298
303
    def _get_time_text(self, display_seconds = None):
299
304
        if display_seconds == None:
300
305
            display_seconds = self.display_seconds
301
 
        time_format = "%H:%M"
302
 
        if display_seconds:
303
 
            time_format = "%H:%M:%S"
304
 
        return datetime.datetime.now().strftime(time_format)
 
306
        if self.twenty_four_hour_digital:
 
307
            return g15locale.format_time_24hour(datetime.datetime.now(), self.gconf_client, display_seconds)
 
308
        else:
 
309
            return g15locale.format_time(datetime.datetime.now(), self.gconf_client, display_seconds)
305
310
    
306
311
    def _get_date_text(self):
307
312
        if self.display_year:
399
404
            s_deg = now.second * 6
400
405
        m_deg = now.minute * 6 + ( now.second * ( 6.0 / 60.0 ) )
401
406
        
402
 
        if self.gconf_client.get_bool(self.gconf_key + "/twenty_four_hour"):
 
407
        if self.twenty_four_hour:
403
408
            h_deg = float(now.hour) * 15.0 + (  float ( now.minute * 0.25 ) )
404
409
        else:
405
410
            h_deg = float( now.hour % 12 ) * 30.0 + (  float ( now.minute * 0.5 ) )