[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Camino-devel] camino/src client/Theme.cpp server/ServerDialog...
|
From: |
Philippe Fremy |
|
Subject: |
[Camino-devel] camino/src client/Theme.cpp server/ServerDialog... |
|
Date: |
Fri, 28 Feb 2003 07:08:08 -0500 |
CVSROOT: /cvsroot/camino
Module name: camino
Changes by: Philippe Fremy <address@hidden> 03/02/28 07:08:08
Modified files:
src/client : Theme.cpp
src/server : ServerDialog.cpp ServerDialogUI.ui
Log message:
- only display the team selection in 4 players mode
- display the name of the players in the team selection page
Patches:
Index: camino/src/client/Theme.cpp
diff -u camino/src/client/Theme.cpp:1.7 camino/src/client/Theme.cpp:1.8
--- camino/src/client/Theme.cpp:1.7 Thu Feb 27 12:26:25 2003
+++ camino/src/client/Theme.cpp Fri Feb 28 07:08:07 2003
@@ -2,7 +2,7 @@
**
** Camino
**
-** Version : $Id: Theme.cpp,v 1.7 2003/02/27 17:26:25 pfremy Exp $
+** Version : $Id: Theme.cpp,v 1.8 2003/02/28 12:08:07 pfremy Exp $
**
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 22/01/2003
@@ -44,7 +44,7 @@
/** add comments here */
Theme::Theme()
{
- _level = 1;
+ _level = 2;
_tiles = 0;
_name = "";
Index: camino/src/server/ServerDialog.cpp
diff -u camino/src/server/ServerDialog.cpp:1.11
camino/src/server/ServerDialog.cpp:1.12
--- camino/src/server/ServerDialog.cpp:1.11 Thu Feb 27 17:58:39 2003
+++ camino/src/server/ServerDialog.cpp Fri Feb 28 07:08:08 2003
@@ -2,7 +2,7 @@
**
** Camino
**
-** Version : $Id: ServerDialog.cpp,v 1.11 2003/02/27 22:58:39 pfremy Exp $
+** Version : $Id: ServerDialog.cpp,v 1.12 2003/02/28 12:08:08 pfremy Exp $
**
** Author(s) : Philippe Fremy, Pascal Audoux
** Creation : 14/01/2003
@@ -30,6 +30,7 @@
#include <qradiobutton.h>
#include <qlineedit.h>
#include <qlistview.h>
+#include <qlabel.h>
// application specific include files
#include "ServerDialog.h"
@@ -41,6 +42,10 @@
ServerDialog::ServerDialog( QWidget * parent, const char * name )
:ServerDialogUI( parent, name )
{
+ _team1->toggle();
+ _team2->toggle();
+ _team3->toggle();
+
slot_2players();
slot_team1();
@@ -84,7 +89,25 @@
setFinishEnabled( _pageWaitConnection, true );
nextButton()->hide();
} else {
+ QListViewItem * item;
setNextEnabled( _pageWaitConnection, true );
+ item = _playerList->firstChild();
+ player1A->setText( item->text( 1 ) );
+ player1B->setText( item->text( 1 ) );
+ player1C->setText( item->text( 1 ) );
+ item = item->nextSibling();
+ player2A->setText( item->text( 1 ) );
+ player2B->setText( item->text( 1 ) );
+ player2C->setText( item->text( 1 ) );
+ item = item->nextSibling();
+ player3A->setText( item->text( 1 ) );
+ player3B->setText( item->text( 1 ) );
+ player3C->setText( item->text( 1 ) );
+ item = item->nextSibling();
+ player4A->setText( item->text( 1 ) );
+ player4B->setText( item->text( 1 ) );
+ player4C->setText( item->text( 1 ) );
+
}
}
Index: camino/src/server/ServerDialogUI.ui
diff -u camino/src/server/ServerDialogUI.ui:1.6
camino/src/server/ServerDialogUI.ui:1.7
--- camino/src/server/ServerDialogUI.ui:1.6 Tue Jan 28 16:54:27 2003
+++ camino/src/server/ServerDialogUI.ui Fri Feb 28 07:08:08 2003
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>393</width>
- <height>287</height>
+ <width>351</width>
+ <height>306</height>
</rect>
</property>
<property name="caption">
@@ -188,58 +188,458 @@
<cstring>_pageTeam</cstring>
</property>
<attribute name="title">
- <string>Choose teams</string>
+ <string>Choose team configuration</string>
</attribute>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>_team3</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>90</y>
- <width>360</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Team 3</string>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>_team2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>50</y>
- <width>360</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Team 2</string>
- </property>
- </widget>
- <widget class="QRadioButton">
+ <vbox>
<property name="name">
- <cstring>_team1</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>360</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Team 1</string>
+ <cstring>unnamed</cstring>
</property>
- </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout10</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="spacing">
+ <number>10</number>
+ </property>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>_team1</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout7</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player1A</cstring>
+ </property>
+ <property name="text">
+ <string>Player 1</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player2A</cstring>
+ </property>
+ <property name="text">
+ <string>Player 2</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>vs</string>
+ </property>
+ <property name="alignment">
+ <set>AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout5</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player3A</cstring>
+ </property>
+ <property name="text">
+ <string>Player 3</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player4A</cstring>
+ </property>
+ <property name="text">
+ <string>Player 4</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>71</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout10_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="spacing">
+ <number>10</number>
+ </property>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>_team2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout7_2</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player1B</cstring>
+ </property>
+ <property name="text">
+ <string>Player 1</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player3B</cstring>
+ </property>
+ <property name="text">
+ <string>Player 3</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>vs</string>
+ </property>
+ <property name="alignment">
+ <set>AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout5_2</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player2B</cstring>
+ </property>
+ <property name="text">
+ <string>Player 2</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player4B</cstring>
+ </property>
+ <property name="text">
+ <string>Player 4</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>71</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout10_2_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <property name="spacing">
+ <number>10</number>
+ </property>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>_team3</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout7_2_2</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player1C</cstring>
+ </property>
+ <property name="text">
+ <string>Player 1</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player4C</cstring>
+ </property>
+ <property name="text">
+ <string>Player 4</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2_2_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>vs</string>
+ </property>
+ <property name="alignment">
+ <set>AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout5_2_2</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player2C</cstring>
+ </property>
+ <property name="text">
+ <string>Player 2</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>player3C</cstring>
+ </property>
+ <property name="text">
+ <string>Player 3</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer2_2_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>71</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ </vbox>
</widget>
</widget>
+<connections>
+ <connection>
+ <sender>_team1</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player1A</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team1</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>textLabel2_2</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team1</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player2A</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team1</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player3A</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team1</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player4A</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team3</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player1C</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team3</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player4C</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team3</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>textLabel2_2_2_2</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team3</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player2C</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team3</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player3C</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team2</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player1B</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team2</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player3B</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team2</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>textLabel2_2_2</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team2</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player2B</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>_team2</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>player4B</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+</connections>
<slots>
<slot>slot_startGame()</slot>
<slot>slot_playerConnected( QString, QString )</slot>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Camino-devel] camino/src client/Theme.cpp server/ServerDialog...,
Philippe Fremy <=