[Pioneers-commits] r7 - in trunk: . client/gtk client/help/C po server/gtk
kemm at garage.maemo.org
kemm at garage.maemo.org
Sun Feb 17 20:17:20 EET 2008
Author: kemm
Date: 2008-02-17 20:17:18 +0200 (Sun, 17 Feb 2008)
New Revision: 7
Modified:
trunk/client/gtk/gui.c
trunk/client/help/C/Makefile.in
trunk/configure.ac
trunk/po/Makefile.in.in
trunk/server/gtk/main.c
Log:
* Move development to Chinook. Sorry, but there is no Bora version. At least, until first stable release is out.
* Hildonize toolbar
* Move chat window into the separate tab
* Remove "16:9" option
Modified: trunk/client/gtk/gui.c
===================================================================
--- trunk/client/gtk/gui.c 2008-01-05 12:45:56 UTC (rev 6)
+++ trunk/client/gtk/gui.c 2008-02-17 18:17:18 UTC (rev 7)
@@ -28,7 +28,7 @@
#include <libgnome/libgnome.h>
#endif
-#include <hildon-widgets/hildon-program.h>
+#include <hildon/hildon-program.h>
#include "aboutbox.h"
#include "frontend.h"
@@ -52,9 +52,10 @@
enum {
MAP_PAGE, /* the map */
+ CHAT_PAGE, /* chat */
TRADE_PAGE, /* trading interface */
QUOTE_PAGE, /* submit quotes page */
- LEGEND_PAGE, /* legend */
+ LEGEND_PAGE, /* legend */
SPLASH_PAGE /* splash screen */
};
@@ -564,6 +565,7 @@
static GtkWidget *build_map_panel(void)
{
GtkWidget *lbl;
+ GtkWidget *panel;
map_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(map_notebook), GTK_POS_TOP);
@@ -575,6 +577,19 @@
gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook),
build_map_area(), lbl, MAP_PAGE);
+ /* Tab page name */
+ lbl = gtk_label_new(_("Chat"));
+ gtk_widget_show(lbl);
+ chat_panel = gtk_vbox_new(FALSE, 0);
+ gtk_widget_show(chat_panel);
+ panel = chat_build_panel();
+ frontend_gui_register(panel, GUI_DISCONNECT, NULL);
+ gtk_box_pack_start(GTK_BOX(chat_panel), panel, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(chat_panel),
+ build_messages_panel(), TRUE, TRUE, 0);
+ gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook),
+ chat_panel, lbl, CHAT_PAGE);
+
/* Tab page name */
lbl = gtk_label_new(_("Trade"));
gtk_widget_show(lbl);
@@ -674,6 +689,7 @@
return develop_notebook;
}
+#if 0
static gboolean get_16_9_layout(void)
{
GtkWidget *paned;
@@ -716,6 +732,7 @@
}
g_object_unref(chat_panel);
}
+#endif
static GtkWidget *build_main_interface(void)
{
@@ -750,18 +767,6 @@
gtk_paned_pack1(GTK_PANED(vpaned), build_map_panel(), TRUE, TRUE);
- chat_panel = gtk_vbox_new(FALSE, 0);
- gtk_widget_show(chat_panel);
-
- panel = chat_build_panel();
- frontend_gui_register(panel, GUI_DISCONNECT, NULL);
- gtk_box_pack_start(GTK_BOX(chat_panel), panel, FALSE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(chat_panel),
- build_messages_panel(), TRUE, TRUE, 0);
-
- set_16_9_layout(config_get_int_with_default
- ("settings/layout_16_9", FALSE));
-
gtk_paned_pack2(GTK_PANED(hpaned), main_paned, TRUE, TRUE);
return hpaned;
}
@@ -828,14 +833,6 @@
set_announce_player(announce_player);
}
-static void toggle_16_9_cb(GtkToggleButton * widget,
- G_GNUC_UNUSED gpointer user_data)
-{
- gboolean layout_16_9 = gtk_toggle_button_get_active(widget);
- config_set_int("settings/layout_16_9", layout_16_9);
- set_16_9_layout(layout_16_9);
-}
-
static void showhide_toolbar_cb(void)
{
gui_set_toolbar_visible();
@@ -1017,22 +1014,6 @@
NULL);
row++;
- /* Label for the option to use the 16:9 layout. */
- widget = gtk_check_button_new_with_label(_("Use 16:9 layout"));
- gtk_widget_show(widget);
- gtk_table_attach_defaults(GTK_TABLE(layout), widget,
- 0, 2, row, row + 1);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),
- get_16_9_layout());
- g_signal_connect(G_OBJECT(widget), "toggled",
- G_CALLBACK(toggle_16_9_cb), NULL);
- /* Tooltip for 16:9 option. */
- gtk_tooltips_set_tip(tooltips, widget,
- _
- ("Use a 16:9 friendly layout for the window"),
- NULL);
- row++;
-
}
static void help_about_cb(void)
@@ -1155,10 +1136,13 @@
(gtk_ui_manager_get_action
(ui_manager,
"ui/MainMenu/SettingsMenu/ShowHideToolbar")));
- if (visible)
- gtk_widget_show(GTK_WIDGET(list->data));
- else
- gtk_widget_hide(GTK_WIDGET(list->data));
+ if (visible) {
+ //gtk_widget_show(GTK_WIDGET(list->data));
+ gtk_widget_show(toolbar);
+ } else {
+ //gtk_widget_hide(GTK_WIDGET(list->data));
+ gtk_widget_hide(toolbar);
+ }
config_set_int("settings/show_toolbar", visible);
g_slist_free(list);
}
@@ -1264,6 +1248,7 @@
return;
}
gtk_tool_item_set_visible_horizontal(item, visible);
+ gtk_tool_item_set_visible_vertical(item, visible);
g_free(fullpath);
}
@@ -1526,8 +1511,6 @@
menubar = gtk_ui_manager_get_widget(ui_manager, "/MainMenu");
//gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
- ////hildon_window_set_menu(HILDON_WINDOW(app_window), GTK_MENU(menubar));
- hildon_window_set_menu(HILDON_WINDOW(app_window), GTK_MENU(menubar));
toolbar = gtk_ui_manager_get_widget(ui_manager, "/MainToolbar");
//gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
@@ -1548,18 +1531,13 @@
g_signal_connect(G_OBJECT(app_window), "key_press_event",
G_CALLBACK(hotkeys_handler), NULL);
- hildon_window_add_toolbar(HILDON_WINDOW(app_window), GTK_TOOLBAR(toolbar));
- gtk_widget_show_all(toolbar);
-
- gtk_widget_show(app_window);
-
frontend_gui_register_action(getAction(GUI_CONNECT), GUI_CONNECT);
frontend_gui_register_action(getAction(GUI_DISCONNECT),
GUI_DISCONNECT);
#ifdef ADMIN_GTK
/** @todo RC 2005-05-26 Admin interface: Not tested */
frontend_gui_register_action(gtk_ui_manager_get_action
- (manager,
+ (ui_manager,
"ui/MainMenu/GameMenu/GameAdmin"),
GUI_ADMIN);
#endif
@@ -1583,7 +1561,7 @@
GUI_CITY_WALL);
#if 0
frontend_gui_register_destroy(gtk_ui_manager_get_action
- (manager, "GameQuit"), GUI_QUIT);
+ (ui_manager, "GameQuit"), GUI_QUIT);
#endif
gui_toolbar_show_button("BuildShip", FALSE);
@@ -1598,6 +1576,9 @@
gtk_widget_show(app_window);
g_signal_connect(G_OBJECT(app_window), "delete_event",
G_CALLBACK(quit_cb), NULL);
+ hildon_window_set_menu(HILDON_WINDOW(app_window), GTK_MENU(menubar));
+ hildon_window_add_toolbar(HILDON_WINDOW(app_window), GTK_TOOLBAR(toolbar));
+ gtk_widget_show(app_window);
return app_window;
}
Modified: trunk/client/help/C/Makefile.in
===================================================================
--- trunk/client/help/C/Makefile.in 2008-01-05 12:45:56 UTC (rev 6)
+++ trunk/client/help/C/Makefile.in 2008-02-17 18:17:18 UTC (rev 7)
@@ -215,6 +215,7 @@
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-01-05 12:45:56 UTC (rev 6)
+++ trunk/configure.ac 2008-02-17 18:17:18 UTC (rev 7)
@@ -372,7 +372,7 @@
AM_GLIB_GNU_GETTEXT
AC_DEFINE_UNQUOTED(ALL_LINGUAS, "$ALL_LINGUAS", [Available languages])
-PKG_CHECK_MODULES(UI, [ hildon-libs libosso ])
+PKG_CHECK_MODULES(UI, [ hildon-1 libosso ])
AC_SUBST(CFLAGS, "$CFLAGS $UI_CFLAGS")
AC_SUBST(LIBS, "$LIBS $UI_LIBS")
Modified: trunk/po/Makefile.in.in
===================================================================
--- trunk/po/Makefile.in.in 2008-01-05 12:45:56 UTC (rev 6)
+++ trunk/po/Makefile.in.in 2008-02-17 18:17:18 UTC (rev 7)
@@ -25,6 +25,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
libdir = @libdir@
localedir = $(libdir)/locale
@@ -40,6 +41,7 @@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
XGETTEXT = @XGETTEXT@
MSGMERGE = msgmerge
@@ -78,7 +80,7 @@
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -c -o $$file $<
+ && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
Modified: trunk/server/gtk/main.c
===================================================================
--- trunk/server/gtk/main.c 2008-01-05 12:45:56 UTC (rev 6)
+++ trunk/server/gtk/main.c 2008-02-17 18:17:18 UTC (rev 7)
@@ -30,7 +30,7 @@
#include <gtk/gtk.h>
#include <string.h>
-#include <hildon-widgets/hildon-program.h>
+#include <hildon/hildon-program.h>
#include "authors.h"
#include "aboutbox.h"
More information about the Pioneers-commits
mailing list