Changeset db2d6e7f884e4ab8b10583f6a687c5423a430be4

Timestamp:

09/21/08 20:20:47 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

b4bda6d6932419cde8676f966ea573923e787066

Children:

9c500538acd917060c6d064f3e0bf857426a16ef

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-21T20:20:47Z+0200

Message:

Display version information on -v

2008-08-21 Armin Burgmeier <armin@…>

• src/main.cpp: Display version information on -v.

Files:

• ChangeLog (modified) (1 diff)
• src/main.cpp (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2008-08-21  Armin Burgmeier  <armin@arbur.net>
+
+        * src/main.cpp: Display version information on -v.
+
 2008-09-21  Armin Burgmeier  <armin@arbur.net>
 

src/main.cpp

@@ -22 +22 @@
 #include "core/iconmanager.hpp"
 #include "util/config.hpp"
+#include "util/i18n.hpp"
 
 #include <gtkmm/main.h>
@@ -44 +45 @@
                 std::cerr << "Unhandled exception: " << message << std::endl;
         }
+
+        const char* _(const char* str)
+        {
+                return Gobby::_(str);
+        }
 }
 
@@ -56 +62 @@
         bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 
-        bool new_instance = false;
-        Glib::ustring join;
+        bool display_version = false;
+
+        Glib::OptionGroup opt_group_gobby("gobby",
+                _("Gobby options"), _("Options related to Gobby"));
+        Glib::OptionEntry opt_version;
+        opt_version.set_short_name('v');
+        opt_version.set_long_name("version");
+        opt_version.set_description(
+                _("Display version information and exit"));
+        opt_group_gobby.add_entry(opt_version, display_version);
 
         Glib::OptionContext opt_ctx;
         opt_ctx.set_help_enabled(true);
         opt_ctx.set_ignore_unknown_options(false);
+        opt_ctx.set_main_group(opt_group_gobby);
 
         // I would rather like to have Gtk::Main on the stack, but I see
         // no other chance to catch exceptions from the command line option
         // parsing. armin.
+        // TODO: Maybe we should parse before initializing GTK+, using
+        // Gtk::Main::add_gtk_option_group() with open_default_display set
+        // to false.
         std::auto_ptr<Gtk::Main> kit;
 
@@ -76 +94 @@
                 std::cerr << e.what() << std::endl;
                 return EXIT_FAILURE;
+        }
+
+        if(display_version)
+        {
+                std::cout << "Gobby " << PACKAGE_VERSION << std::endl;
+                return EXIT_SUCCESS;
         }
 
@@ -94 +118 @@
         wnd.show();
 
-        // Cannot use just kit.run(wnd) since this would show wnd. If we
-        // are just sending some data to theother gobby, we do not want
-        // the window to be shown.
         wnd.signal_hide().connect(sigc::ptr_fun(&Gtk::Main::quit) );
         kit->run();