Imported Upstream version 1.4

diff --git a/AUTHORS b/AUTHORS
index 485e517..d603bc6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,8 @@
 Code and stuff:
  * Dmitry Medvinsky <dmedvinsky@gmail.com>
  * Kim Hempel <kim@hempel.nu>
+ * Paul Vint <pjvint@gmail.com>
+ * Ryan Quinlan <ryan.van.quinlan@gmail.com>
 
 Bugs and ideas:
  * Sergei Sarbash <sarbash.s@gmail.com>

diff --git a/COPYING b/COPYING
index 52800d8..4c3e1f9 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2009, Dmitry Medvinsky
+Copyright (c) 2009-2012, Dmitry Medvinsky
 
 Some rights reserved.
 

diff --git a/ChangeLog b/ChangeLog
index 9282852..00f61c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-18: v1.4:
++ Add option to close gsimplecal when it loses focus
+
+2012-01-23: v1.3:
++ Add options for mainwindow position fine-tuning
+
+2011-12-06: v1.2:
++ Add `--version` and `--help` flags
+
 2011-09-19: v1.1:
 + Add new option: mainwindow_resizable
 

diff --git a/configure.ac b/configure.ac
index 277d1b4..d5491ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.65])
 AC_INIT([gsimplecal],
-        [1.2],
+        [1.4],
         [https://github.com/dmedvinsky/gsimplecal/issues],
         [gsimplecal],
         [https://github.com/dmedvinsky/gsimplecal])

diff --git a/doc/gsimplecal.1 b/doc/gsimplecal.1
index a0f7de0..84b39fe 100644 (file)
--- a/doc/gsimplecal.1
+++ b/doc/gsimplecal.1
@@ -1,4 +1,4 @@
-.TH GSIMPLECAL 1 "2011-12-06"
+.TH GSIMPLECAL 1 "2012-02-18"
 .SH NAME
 gsimplecal \- lightweight calendar applet
 
@@ -63,6 +63,8 @@ mark_today = 1
 .br
 show_week_numbers = 0
 .br
+close_on_unfocus = 0
+.br
 external_viewer = sunbird -showdate "%Y-%m-%d"
 .br
 clock_format = %a %d %b %H:%M
@@ -79,6 +81,10 @@ mainwindow_resizable = 0
 .br
 mainwindow_position = none
 .br
+mainwindow_xoffset = 0
+.br
+mainwindow_yoffset = 0
+.br
 clock_label = UTC
 .br
 clock_tz = :UTC
@@ -108,6 +114,12 @@ somehow, e.g. in bold print).
 \fBshow_week_numbers\fP: 1 or 0, defaults to 0.
 Sets whether week numbers are shown in the calendar.
 
+.TP 5
+\fBclose_on_unfocus\fP: 1 or 0, defaults to 0.
+Sets whether the calendar will close if the window loses focus. Note that if
+mainwindow_skip_taskbar is set to 1 then the calendar window may not be given
+focus upon creation
+
 .TP 5
 \fBexternal_viewer\fP: string, defaults to empty string.
 Command line to run when doubleclicking a date. This string is strftime'd
@@ -170,6 +182,11 @@ it's up to your window manager to decide, where to place the window
 can configure your window manager to place gsimplecal in some predefined
 position).
 
+.TP 5
+\fBmainwindow_xoffset\fP and \fBmainwindow_yoffset\fP: integer, default to 0.
+Allow for main window position fine tuning. Throw an integer at these, and
+it'll move the window by that number of pixels.
+
 .TP 5
 \fBclock_label\fP and \fBclock_tz\fP: string
 These two options should go in pairs and \fBmust\fP be in the order given.

diff --git a/src/Config.cpp b/src/Config.cpp
index 5a38640..9d870f9 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -56,8 +56,11 @@ void Config::getDefaults()
     mainwindow_sticky = false;
     mainwindow_skip_taskbar = true;
     mainwindow_position = GTK_WIN_POS_MOUSE;
+    mainwindow_xoffset = 0;
+    mainwindow_yoffset = 0;
     mark_today = true;
     show_week_numbers = false;
+    close_on_unfocus = false;
 }
 
 bool Config::getFile()
@@ -140,6 +143,16 @@ void Config::addOption(string var, string val)
         } else {
             mainwindow_position = GTK_WIN_POS_NONE;
         }
+    } else if (var == "mainwindow_xoffset") {
+       stringstream convert(val);
+       if (!(convert >> mainwindow_xoffset)) {
+               mainwindow_xoffset = 0;
+       }
+    }  else if (var == "mainwindow_yoffset") {
+        stringstream convert(val);
+        if (!(convert >> mainwindow_yoffset)) {
+           mainwindow_yoffset = 0;
+       }
     } else if (var == "mainwindow_resizable") {
         if (!fromString<bool>(mainwindow_resizable, val)) {
             mainwindow_resizable = true;
@@ -154,6 +167,10 @@ void Config::addOption(string var, string val)
         if (!fromString<bool>(show_week_numbers, val)) {
             show_week_numbers = false;
         }
+    } else if (var == "close_on_unfocus") {
+        if (!fromString<bool>(close_on_unfocus, val)) {
+            close_on_unfocus = false;
+        }
     }
 }
 

diff --git a/src/Config.hpp b/src/Config.hpp
index d8fb038..0dcff1d 100644 (file)
--- a/src/Config.hpp
+++ b/src/Config.hpp
@@ -29,6 +29,7 @@ public:
     bool mark_today;
     string external_viewer;
     bool show_week_numbers;
+    bool close_on_unfocus;
 
     bool mainwindow_decorated;
     bool mainwindow_keep_above;
@@ -36,6 +37,8 @@ public:
     bool mainwindow_skip_taskbar;
     bool mainwindow_resizable;
     GtkWindowPosition mainwindow_position;
+    int mainwindow_xoffset;
+    int mainwindow_yoffset;
 
 private:
     static Config* _instance;

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 5a45cf8..b7e1460 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -60,12 +60,14 @@ bool goTodayCallback(GtkAccelGroup *group, GObject *obj, guint keyval,
 MainWindow::MainWindow()
 {
     Config* config = Config::getInstance();
-
+    gint xpos, ypos;
     widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
     gtk_window_set_title(GTK_WINDOW(widget), "gsimplecal");
     gtk_window_set_decorated(GTK_WINDOW(widget), config->mainwindow_decorated);
     gtk_window_set_position(GTK_WINDOW(widget), config->mainwindow_position);
+    gtk_window_get_position(GTK_WINDOW(widget), &xpos, &ypos);
+    gtk_window_move(GTK_WINDOW(widget),  config->mainwindow_xoffset + xpos,  config->mainwindow_yoffset + ypos);
     gtk_window_set_resizable(GTK_WINDOW(widget), config->mainwindow_resizable);
     gtk_window_set_keep_above(GTK_WINDOW(widget),
                               config->mainwindow_keep_above);

diff --git a/src/gsimplecal.cpp b/src/gsimplecal.cpp
index 8642b57..1a5b696 100644 (file)
--- a/src/gsimplecal.cpp
+++ b/src/gsimplecal.cpp
@@ -105,6 +105,11 @@ int main(int argc, char *argv[])
     if (config->show_timezones) {
         g_timeout_add(30000, (GSourceFunc)time_handler, NULL);
     }
+    if (config->close_on_unfocus) {
+        g_signal_connect(G_OBJECT(main_window->getWindow()), "focus-out-event",
+                                  GTK_SIGNAL_FUNC(gtk_widget_destroy),
+                                  GTK_OBJECT(main_window->getWindow()));
+    }
 
     gtk_main();