Menu
▾
▴
[Pybridge-commits] SF.net SVN: pybridge: [403] trunk/pybridge
|
From: <umg...@us...> - 2007-04-06 18:02:34
|
Revision: 403
http://svn.sourceforge.net/pybridge/?rev=403&view=rev
Author: umgangee
Date: 2007-04-06 11:02:26 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Tweaks to window_main Glade file, remove unused dialog_gameresult.
Modified Paths:
--------------
trunk/pybridge/glade/pybridge.glade
Removed Paths:
-------------
trunk/pybridge/pybridge/ui/dialog_gameresult.py
Modified: trunk/pybridge/glade/pybridge.glade
===================================================================
--- trunk/pybridge/glade/pybridge.glade 2007-04-06 17:58:59 UTC (rev 402)
+++ trunk/pybridge/glade/pybridge.glade 2007-04-06 18:02:26 UTC (rev 403)
@@ -15,13 +15,49 @@
<child>
<widget class="GtkMenuItem" id="menu_server">
<property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
+ <property name="label" translatable="yes">_Server</property>
<property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="menu_server_menu">
<child>
+ <widget class="GtkImageMenuItem" id="menu_connect">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Connect to Server...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_connect_activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image342">
+ <property name="visible">True</property>
+ <property name="stock">gtk-connect</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkImageMenuItem" id="menu_disconnect">
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">_Disconnect</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_disconnect_activate"/>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-disconnect</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="menu_separator">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
<widget class="GtkImageMenuItem" id="menu_newtable">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label" translatable="yes">_New Table...</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_newtable_clicked"/>
@@ -56,21 +92,6 @@
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menu_disconnect">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Disconnect</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_disconnect_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image342">
- <property name="visible">True</property>
- <property name="stock">gtk-disconnect</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
<widget class="GtkImageMenuItem" id="menu_quit">
<property name="visible">True</property>
<property name="label">gtk-quit</property>
@@ -159,6 +180,7 @@
<child>
<widget class="GtkNotebook" id="notebook">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<signal name="switch_page" handler="on_notebook_switch_page"/>
<child>
@@ -193,6 +215,7 @@
<child>
<widget class="GtkButton" id="newtable">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
<signal name="clicked" handler="on_newtable_clicked"/>
<child>
@@ -1418,10 +1441,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-quit</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
- <signal name="clicked" handler="on_quit_clicked"/>
+ <signal name="clicked" handler="on_cancel_clicked"/>
</widget>
</child>
<child>
@@ -1545,148 +1568,6 @@
</widget>
</child>
</widget>
- <widget class="GtkDialog" id="dialog_gameresult">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Game Result</property>
- <property name="resizable">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="skip_taskbar_hint">True</property>
- <signal name="delete_event" handler="on_dialog_gameresult_delete_event"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
- <property name="visible">True</property>
- <child>
- <widget class="GtkHBox" id="hbox16">
- <property name="visible">True</property>
- <child>
- <widget class="GtkImage" id="image_information">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_result">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">12</property>
- <property name="pack_type">GTK_PACK_END</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="button_leavetable">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <signal name="clicked" handler="on_leavetable_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment17">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox14">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image166">
- <property name="visible">True</property>
- <property name="stock">gtk-quit</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label21">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Leave Table</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkButton" id="button_nextdeal">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <signal name="clicked" handler="on_nextdeal_clicked"/>
- <child>
- <widget class="GtkAlignment" id="alignment18">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox15">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image167">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Next Deal</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
<widget class="GtkWindow" id="window_bridgetable">
<property name="visible">True</property>
<property name="title" translatable="yes">Table</property>
@@ -1706,6 +1587,10 @@
<property name="stock_id">gtk-media-play</property>
<signal name="clicked" handler="on_takeseat_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToolButton" id="leaveseat">
@@ -1716,11 +1601,18 @@
<property name="stock_id">gtk-media-stop</property>
<signal name="clicked" handler="on_leaveseat_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkSeparatorToolItem" id="separatortoolitem2">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToggleToolButton" id="toggle_gameinfo">
@@ -1731,6 +1623,9 @@
<property name="active">True</property>
<signal name="clicked" handler="on_toggle_gameinfo_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToggleToolButton" id="toggle_chat">
@@ -1741,6 +1636,9 @@
<property name="active">True</property>
<signal name="clicked" handler="on_toggle_chat_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToggleToolButton" id="toggle_fullscreen">
@@ -1748,11 +1646,18 @@
<property name="stock_id">gtk-fullscreen</property>
<signal name="clicked" handler="on_toggle_fullscreen_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkSeparatorToolItem" id="separatortoolitem1">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToolButton" id="leavetable">
@@ -1762,6 +1667,9 @@
<property name="stock_id">gtk-quit</property>
<signal name="clicked" handler="on_leavetable_clicked"/>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
</widget>
<packing>
Deleted: trunk/pybridge/pybridge/ui/dialog_gameresult.py
===================================================================
--- trunk/pybridge/pybridge/ui/dialog_gameresult.py 2007-04-06 17:58:59 UTC (rev 402)
+++ trunk/pybridge/pybridge/ui/dialog_gameresult.py 2007-04-06 18:02:26 UTC (rev 403)
@@ -1,49 +0,0 @@
-# PyBridge -- online contract bridge made easy.
-# Copyright (C) 2004-2006 PyBridge Project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-import gtk
-from wrapper import GladeWrapper
-
-
-class DialogGameresult(GladeWrapper):
-
- glade_name = 'dialog_gameresult'
-
-
- def new(self):
- pass
-
-
- def setup(self, message):
- self.label_result.set_text(message)
-
-
-# Signal handlers.
-
-
- def on_leavetable_clicked(self, widget, *args):
- self.parent.on_leavetable_clicked(widget, *args)
-
-
- def on_nextdeal_clicked(self, widget, *args):
- self.parent.children.close(self.glade_name)
-
-
- def on_dialog_gameresult_delete_event(self, widget, *args):
- return True # Stops window deletion taking place.
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
