Changeset 8835374a5ff6f22b683226976026fe5ab83e05f8

Timestamp:

01/06/07 23:37:43 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

6a0670a8459e5cf3b91239cc10ad8d5feaf36095

Children:

990c82025388b2f0ff1e428dd3acb41b244f22b0

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:37:43Z+0000

Message:

[project @ Introduced DefaultDialog? to allow to press Enter in dialogs]

Original author: Armin Burgmeier <armin@…>
Date: 2005-06-04 19:47:16+00:00

Files:

• Makefile.am (modified) (2 diffs)
• inc/defaultdialog.hpp (added)
• inc/entrydialog.hpp (modified) (1 diff)
• inc/hostdialog.hpp (modified) (3 diffs)
• inc/joindialog.hpp (modified) (3 diffs)
• src/defaultdialog.cpp (added)
• src/entrydialog.cpp (modified) (2 diffs)
• src/hostdialog.cpp (modified) (1 diff)
• src/joindialog.cpp (modified) (1 diff)

Makefile.am

@@ -26 +26 @@
 noinst_HEADERS += inc/mimemap.hpp
 endif
+noinst_HEADERS += inc/defaultdialog.hpp
 noinst_HEADERS += inc/historyentry.hpp
 noinst_HEADERS += inc/logview.hpp
@@ -67 +68 @@
 gobby_SOURCES += src/mimemap.cpp
 endif
+gobby_SOURCES += src/defaultdialog.cpp
 gobby_SOURCES += src/historyentry.cpp
 gobby_SOURCES += src/logview.cpp

inc/entrydialog.hpp

@@ -20 +20 @@
 #define _GOBBY_ENTRYDIALOG_HPP_
 
-#include <gtkmm/dialog.h>
 #include <gtkmm/label.h>
 #include <gtkmm/entry.h>
+#include "defaultdialog.hpp"
 
 namespace Gobby
 {
 
-class EntryDialog : public Gtk::Dialog
+class EntryDialog : public DefaultDialog
 {
 public:

inc/hostdialog.hpp

@@ -20 +20 @@
 #define _GOBBY_HOSTDIALOG_HPP_
 
-#include <gtkmm/dialog.h>
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
@@ -26 +25 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/colorbutton.h>
+#include "defaultdialog.hpp"
 #include "config.hpp"
 
@@ -31 +31 @@
 {
 
-class HostDialog : public Gtk::Dialog
+class HostDialog : public DefaultDialog
 {
 public:

inc/joindialog.hpp

@@ -20 +20 @@
 #define _GOBBY_JOINDIALOG_HPP_
 
-#include <gtkmm/dialog.h>
 #include <gtkmm/table.h>
 #include <gtkmm/label.h>
@@ -26 +25 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/colorbutton.h>
+#include "defaultdialog.hpp"
 #include "config.hpp"
 
@@ -31 +31 @@
 {
 
-class JoinDialog : public Gtk::Dialog
+class JoinDialog : public DefaultDialog
 {
 public:

src/entrydialog.cpp

@@ -21 +21 @@
 #include "entrydialog.hpp"
 
-Gobby::EntryDialog::EntryDialog(Gtk::Window& parent, const Glib::ustring& title, const Glib::ustring& label) 
- : Gtk::Dialog(title, parent, true, true),
+Gobby::EntryDialog::EntryDialog(Gtk::Window& parent,
+                                const Glib::ustring& title,
+                                const Glib::ustring& label)
+ : DefaultDialog(title, parent, true, true),
    m_label(label),
    m_box(false, 5)
@@ -31 +33 @@
         get_vbox()->set_spacing(5);
         get_vbox()->pack_start(m_box);
+
+        set_default_response(Gtk::RESPONSE_OK);
 
         add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);

src/hostdialog.cpp

@@ -22 +22 @@
 
 Gobby::HostDialog::HostDialog(Gtk::Window& parent, Config& config)
- : Gtk::Dialog(_("Create obby session"), parent, true, true), m_config(config),
+ : DefaultDialog(_("Create obby session"), parent, true, true),
+   m_config(config),
    m_table(3, 2),
    m_lbl_port(_("Port:"), Gtk::ALIGN_RIGHT),

src/joindialog.cpp

@@ -22 +22 @@
 
 Gobby::JoinDialog::JoinDialog(Gtk::Window& parent, Gobby::Config& config)
- : Gtk::Dialog(_("Join obby session"), parent, true, true), m_config(config),
+ : DefaultDialog(_("Join obby session"), parent, true, true),
+   m_config(config),
    m_table(4, 2),
    m_lbl_host(_("Host:"), Gtk::ALIGN_RIGHT),