Imported Upstream version 1.0

diff --git a/AUTHORS b/AUTHORS
index c8a25e9..db2a257 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,12 +5,16 @@ Code and stuff:
 Bugs and ideas:
  * Sergei Sarbash <sarbash.s@gmail.com>
  * Julien Valroff <julien@kirya.net>
+ * Iffan Arzanul Haq <arzanulhaq@gmail.com>
 
 Packages:
  - Arch Linux:
   * Victor Feight <vrfeight3@gmail.com>
+  * jsteel <jsteel@vorx.com>
  - Gentoo Linux:
   * Joshua Saddler <nightmorph@gentoo.org>
   * maelnor
- - Fedora Linux
+ - Fedora Linux:
   * Filip Pytloun <filip.pytloun@stickfish.com>
+ - Debian:
+  * Julien Valroff <julien@debian.org>

diff --git a/ChangeLog b/ChangeLog
index 545744e..9bd3151 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-05: v1.0:
+- Fix bug with external viewer when mark_today is false
++ Add ability to show week numbers — show_week_numbers option
+
 2011-08-24: v0.9:
 - Fix license text not included in distribution
 - Fix last `=` was treated as separator of key/value in config, not the first

diff --git a/configure b/configure
index 001fec7..0af0427 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gsimplecal 0.9.
+# Generated by GNU Autoconf 2.68 for gsimplecal 1.0.
 #
 # Report bugs to <https://github.com/dmedvinsky/gsimplecal/issues>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gsimplecal'
 PACKAGE_TARNAME='gsimplecal'
-PACKAGE_VERSION='0.9'
-PACKAGE_STRING='gsimplecal 0.9'
+PACKAGE_VERSION='1.0'
+PACKAGE_STRING='gsimplecal 1.0'
 PACKAGE_BUGREPORT='https://github.com/dmedvinsky/gsimplecal/issues'
 PACKAGE_URL='https://github.com/dmedvinsky/gsimplecal'
 
@@ -1255,7 +1255,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gsimplecal 0.9 to adapt to many kinds of systems.
+\`configure' configures gsimplecal 1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1321,7 +1321,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gsimplecal 0.9:";;
+     short | recursive ) echo "Configuration of gsimplecal 1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1416,7 +1416,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gsimplecal configure 0.9
+gsimplecal configure 1.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1785,7 +1785,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gsimplecal $as_me 0.9, which was
+It was created by gsimplecal $as_me 1.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2601,7 +2601,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gsimplecal'
- VERSION='0.9'
+ VERSION='1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4590,7 +4590,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gsimplecal $as_me 0.9, which was
+This file was extended by gsimplecal $as_me 1.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4648,7 +4648,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gsimplecal config.status 0.9
+gsimplecal config.status 1.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 8ed93df..394b6fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.65])
 AC_INIT([gsimplecal],
-        [0.9],
+        [1.0],
         [https://github.com/dmedvinsky/gsimplecal/issues],
         [gsimplecal],
         [https://github.com/dmedvinsky/gsimplecal])

diff --git a/doc/gsimplecal.1 b/doc/gsimplecal.1
index 91753e1..4d00fd4 100644 (file)
--- a/doc/gsimplecal.1
+++ b/doc/gsimplecal.1
@@ -40,11 +40,9 @@ You may configure gsimplecal to display different world timezones clocks.
 To make it, you should create
 .nh
 \fB$XDG_CONFIG_HOME/gsimplecal/config\fP
-.ny
 file (usually it will be
 .nh
 ~/.config/gsimplecal/config)
-.ny
 with the following contents:
 
 .IP
@@ -54,7 +52,9 @@ show_timezones = 1
 .br
 mark_today = 1
 .br
-external_viewer = sunbird --cool-arg --date="%Y-%m-%d"
+show_week_numbers = 0
+.br
+external_viewer = sunbird -showdate "%Y-%m-%d"
 .br
 clock_format = %a %d %b %H:%M
 .br
@@ -93,6 +93,10 @@ Sets whether today's date will be marked in the calendar (besides the default
 selection, i.e. when you click on the other day, today will remain marked
 somehow, e.g. in bold print).
 
+.TP 5
+\fBshow_week_numbers\fP: 1 or 0, defaults to 0.
+Sets whether week numbers are shown in the calendar.
+
 .TP 5
 \fBexternal_viewer\fP: string, defaults to empty string.
 Command line to run when doubleclicking a date. This string is strftime'd
@@ -103,7 +107,6 @@ I hope.
 Currently the shell is hardcoded to
 .nh
 /bin/sh
-.ny
 though. I hope that will do for all the users, but if you've got a trouble,
 please file a ticket (see \fIREPORTING BUGS\fP).
 
@@ -187,7 +190,6 @@ These are not yet configurable, but I'm working on it.
 Please, report any issues to the gsimplecal issue tracker, available at:
 .nh
 https://github.com/dmedvinsky/gsimplecal/issues
-.ny
 
 
 .SH AUTHOR

diff --git a/src/Calendar.cpp b/src/Calendar.cpp
index 767b340..3ee711c 100644 (file)
--- a/src/Calendar.cpp
+++ b/src/Calendar.cpp
@@ -35,11 +35,14 @@ void dayDoubleClickCb(GtkCalendar *calendar, gpointer cls)
 Calendar::Calendar()
 {
     widget = gtk_calendar_new();
-    gtk_calendar_set_display_options(GTK_CALENDAR(widget),
-            (GtkCalendarDisplayOptions)(GTK_CALENDAR_SHOW_HEADING +
-                                        GTK_CALENDAR_SHOW_DAY_NAMES));
 
     Config* config = Config::getInstance();
+    g_object_set(widget,
+                 "show-heading", true,
+                 "show-day-names", true,
+                 "show-details", false,
+                 "show-week-numbers", config->show_week_numbers,
+                 NULL);
     if (config->mark_today) {
         // Store today date to be able to mark it after month changes.
         gtk_calendar_get_date((GtkCalendar*)widget,
@@ -47,9 +50,9 @@ Calendar::Calendar()
         markToday();
         gtk_signal_connect(GTK_OBJECT(widget), "month-changed",
                            GTK_SIGNAL_FUNC(monthChangedCb), (gpointer)this);
-        gtk_signal_connect(GTK_OBJECT(widget), "day-selected-double-click",
-                           GTK_SIGNAL_FUNC(dayDoubleClickCb), (gpointer)this);
     }
+    gtk_signal_connect(GTK_OBJECT(widget), "day-selected-double-click",
+                       GTK_SIGNAL_FUNC(dayDoubleClickCb), (gpointer)this);
 
     gtk_widget_show(widget);
 }

diff --git a/src/Config.cpp b/src/Config.cpp
index 32ba6f8..e2ba795 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -57,6 +57,7 @@ void Config::getDefaults()
     mainwindow_skip_taskbar = true;
     mainwindow_position = GTK_WIN_POS_MOUSE;
     mark_today = true;
+    show_week_numbers = false;
 }
 
 bool Config::getFile()
@@ -145,6 +146,10 @@ void Config::addOption(string var, string val)
         }
     } else if (var == "external_viewer") {
         external_viewer = val;
+    } else if (var == "show_week_numbers") {
+        if (!fromString<bool>(show_week_numbers, val)) {
+            show_week_numbers = false;
+        }
     }
 }
 

diff --git a/src/Config.hpp b/src/Config.hpp
index e8430d3..e2261ce 100644 (file)
--- a/src/Config.hpp
+++ b/src/Config.hpp
@@ -28,6 +28,7 @@ public:
     vector<ClockInfo*> clocks;
     bool mark_today;
     string external_viewer;
+    bool show_week_numbers;
 
     bool mainwindow_decorated;
     bool mainwindow_keep_above;