[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Eliot-dev] eliot AUTHORS qt/eliot.qrc qt/main_window.cpp q...
From: |
Olivier Teulière |
Subject: |
[Eliot-dev] eliot AUTHORS qt/eliot.qrc qt/main_window.cpp q... |
Date: |
Sun, 14 Dec 2008 13:27:02 +0000 |
CVSROOT: /cvsroot/eliot
Module name: eliot
Changes by: Olivier Teulière <ipkiss> 08/12/14 13:27:02
Modified files:
. : AUTHORS
qt : eliot.qrc main_window.cpp
qt/ui : main_window.ui
Added files:
qt/images : go-first.png go-jump.png go-last.png
go-next.png go-previous.png info_16px.png
playlist_16px.png preferences.png printer.png
quit_16px.png
Removed files:
qt/images : first.xpm last.xpm next.xpm prev.xpm replay.xpm
Log message:
New icons for the navigation actions, and additional ones for some menu
items
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/AUTHORS?cvsroot=eliot&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/eliot.qrc?cvsroot=eliot&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/main_window.cpp?cvsroot=eliot&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/go-first.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/go-jump.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/go-last.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/go-next.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/go-previous.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/info_16px.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/playlist_16px.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/preferences.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/printer.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/quit_16px.png?cvsroot=eliot&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/first.xpm?cvsroot=eliot&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/last.xpm?cvsroot=eliot&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/next.xpm?cvsroot=eliot&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/prev.xpm?cvsroot=eliot&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/images/replay.xpm?cvsroot=eliot&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/eliot/qt/ui/main_window.ui?cvsroot=eliot&r1=1.13&r2=1.14
Patches:
Index: AUTHORS
===================================================================
RCS file: /cvsroot/eliot/eliot/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- AUTHORS 22 Feb 2008 20:46:46 -0000 1.4
+++ AUTHORS 14 Dec 2008 13:27:00 -0000 1.5
@@ -1,5 +1,13 @@
Eliot ---
Copyright (C) 1999-2008
+Authors:
Antoine Fraboulet <antoine.fraboulet @@ free.fr>
Olivier Teulière <ipkiss @@ gmail.com>
+
+Current maintainer:
+ Olivier Teulière <ipkiss @@ gmail.com>
+
+Most icons come from the Tango project (http://tango.freedesktop.org/)
+and from the VLC media player (http://www.videolan.org/vlc/).
+
Index: qt/eliot.qrc
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/eliot.qrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- qt/eliot.qrc 29 Nov 2008 16:40:59 -0000 1.2
+++ qt/eliot.qrc 14 Dec 2008 13:27:00 -0000 1.3
@@ -1,10 +1,15 @@
<RCC>
<qresource>
+ <file>images/go-first.png</file>
+ <file>images/go-previous.png</file>
+ <file>images/go-next.png</file>
+ <file>images/go-last.png</file>
+ <file>images/go-jump.png</file>
+ <file>images/printer.png</file>
+ <file>images/preferences.png</file>
+ <file>images/playlist_16px.png</file>
+ <file>images/info_16px.png</file>
+ <file>images/quit_16px.png</file>
<file>images/eliot.xpm</file>
- <file>images/first.xpm</file>
- <file>images/last.xpm</file>
- <file>images/prev.xpm</file>
- <file>images/next.xpm</file>
- <file>images/replay.xpm</file>
</qresource>
</RCC>
Index: qt/main_window.cpp
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/main_window.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- qt/main_window.cpp 14 Dec 2008 13:20:44 -0000 1.25
+++ qt/main_window.cpp 14 Dec 2008 13:27:00 -0000 1.26
@@ -118,6 +118,7 @@
m_ui.groupBoxTest->setLayout(hlayout);
+#if 1
// History
HistoryTabWidget *historyTab = new HistoryTabWidget;
QObject::connect(this, SIGNAL(gameChanged(const PublicGame*)),
@@ -127,6 +128,9 @@
QHBoxLayout *hlayout2 = new QHBoxLayout;
hlayout2->addWidget(historyTab);
m_ui.groupBoxHistory->setLayout(hlayout2);
+#else
+ m_ui.groupBoxHistory->hide();
+#endif
// Players racks
m_ui.groupBoxPlayers->hide();
@@ -378,30 +382,32 @@
_q("Save the current game"), SLOT(onGameSaveAs()));
menuFile->addSeparator();
m_actionGamePrint = addMenuAction(menuFile, _q("&Print..."), _q("Ctrl+P"),
- _q("Print the current game"), SLOT(onGamePrint()));
+ _q("Print the current game"), SLOT(onGamePrint()),
+ false, QIcon(":/images/printer.png"));
menuFile->addSeparator();
addMenuAction(menuFile, _q("&Quit"), _q("Ctrl+Q"),
- _q("Quit Eliot"), SLOT(close()));
+ _q("Quit Eliot"), SLOT(close()),
+ false, QIcon(":/images/quit_16px.png"));
QMenu *menuHistory = new QMenu(m_ui.menubar);
m_ui.menubar->addAction(menuHistory->menuAction());
menuHistory->setTitle(_q("&History"));
m_actionHistoryFirstTurn = addMenuAction(menuHistory, _q("&First turn"),
_q("Ctrl+Home"),
_q("Go to the first turn of the game"),
SLOT(onHistoryFirstTurn()),
- false, QIcon(":/images/first.xpm"));
+ false, QIcon(":/images/go-first.png"));
m_actionHistoryPrevTurn = addMenuAction(menuHistory, _q("&Previous turn"),
_q("Ctrl+Left"),
_q("Go to the previous turn of the game"),
SLOT(onHistoryPrevTurn()),
- false, QIcon(":/images/prev.xpm"));
+ false, QIcon(":/images/go-previous.png"));
m_actionHistoryNextTurn = addMenuAction(menuHistory, _q("&Next turn"),
_q("Ctrl+Right"),
_q("Go to the next turn of the game"),
SLOT(onHistoryNextTurn()),
- false, QIcon(":/images/next.xpm"));
+ false, QIcon(":/images/go-next.png"));
m_actionHistoryLastTurn = addMenuAction(menuHistory, _q("&Last turn"),
_q("Ctrl+End"),
_q("Go to the last turn of the game"),
SLOT(onHistoryLastTurn()),
- false, QIcon(":/images/last.xpm"));
+ false, QIcon(":/images/go-last.png"));
m_actionHistoryReplayTurn = addMenuAction(menuHistory, _q("&Replay turn"),
_q("Ctrl+R"),
_q("Play the game from the current position, "
"replacing what was really played"),
SLOT(onHistoryReplayTurn()),
- false, QIcon(":/images/replay.xpm"));
+ false, QIcon(":/images/go-jump.png"));
// Add actions to the toolbar
m_ui.toolBar->addAction(m_actionHistoryFirstTurn);
m_ui.toolBar->addAction(m_actionHistoryPrevTurn);
@@ -415,7 +421,8 @@
addMenuAction(menuSettings, _q("&Choose dictionary..."), _q("Ctrl+C"),
_q("Select a new dictionary"), SLOT(onSettingsChooseDic()));
addMenuAction(menuSettings, _q("&Preferences..."), _q("Ctrl+F"),
- _q("Edit the preferences"), SLOT(onSettingsPreferences()));
+ _q("Edit the preferences"), SLOT(onSettingsPreferences()),
+ false, QIcon(":/images/preferences.png"));
QMenu *menuWindows = new QMenu(m_ui.menubar);
m_ui.menubar->addAction(menuWindows->menuAction());
@@ -428,15 +435,17 @@
m_actionWindowsBoard = addMenuAction(menuWindows, _q("&External board"),
_q("Ctrl+E"),
_q("Show/hide the external board"), SLOT(onWindowsBoard()),
true);
m_actionWindowsHistory = addMenuAction(menuWindows, _q("&History"),
_q("Ctrl+H"),
- _q("Show/hide the game history"), SLOT(onWindowsHistory()),
true);
+ _q("Show/hide the game history"), SLOT(onWindowsHistory()),
+ true, QIcon(":/images/playlist_16px.png"));
m_actionWindowsDicTools = addMenuAction(menuWindows, _q("&Dictionary
tools"), _q("Ctrl+D"),
_q("Show/hide the dictionary tools"),
SLOT(onWindowsDicTools()), true);
QMenu *menuHelp = new QMenu(m_ui.menubar);
m_ui.menubar->addAction(menuHelp->menuAction());
menuHelp->setTitle(_q("&Help"));
- addMenuAction(menuHelp, _q("&About..."), _q("Ctrl+A"),
- _q("About Eliot"), SLOT(onHelpAbout()));
+ addMenuAction(menuHelp, _q("&About..."), QString(""),
+ _q("About Eliot"), SLOT(onHelpAbout()),
+ false, QIcon(":/images/info_16px.png"));
}
Index: qt/ui/main_window.ui
===================================================================
RCS file: /cvsroot/eliot/eliot/qt/ui/main_window.ui,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- qt/ui/main_window.ui 29 Nov 2008 16:41:01 -0000 1.13
+++ qt/ui/main_window.ui 14 Dec 2008 13:27:02 -0000 1.14
@@ -64,7 +64,7 @@
<x>0</x>
<y>0</y>
<width>747</width>
- <height>25</height>
+ <height>22</height>
</rect>
</property>
</widget>
Index: qt/images/go-first.png
===================================================================
RCS file: qt/images/go-first.png
diff -N qt/images/go-first.png
Binary files /dev/null and /tmp/cvsZ5lQEa differ
Index: qt/images/go-jump.png
===================================================================
RCS file: qt/images/go-jump.png
diff -N qt/images/go-jump.png
Binary files /dev/null and /tmp/cvsYokD0a differ
Index: qt/images/go-last.png
===================================================================
RCS file: qt/images/go-last.png
diff -N qt/images/go-last.png
Binary files /dev/null and /tmp/cvsvPbaHd differ
Index: qt/images/go-next.png
===================================================================
RCS file: qt/images/go-next.png
diff -N qt/images/go-next.png
Binary files /dev/null and /tmp/cvsoVwaMd differ
Index: qt/images/go-previous.png
===================================================================
RCS file: qt/images/go-previous.png
diff -N qt/images/go-previous.png
Binary files /dev/null and /tmp/cvsVPwl7d differ
Index: qt/images/info_16px.png
===================================================================
RCS file: qt/images/info_16px.png
diff -N qt/images/info_16px.png
Binary files /dev/null and /tmp/cvsG13Use differ
Index: qt/images/playlist_16px.png
===================================================================
RCS file: qt/images/playlist_16px.png
diff -N qt/images/playlist_16px.png
Binary files /dev/null and /tmp/cvsZVmmLc differ
Index: qt/images/preferences.png
===================================================================
RCS file: qt/images/preferences.png
diff -N qt/images/preferences.png
Binary files /dev/null and /tmp/cvsYFZ44c differ
Index: qt/images/printer.png
===================================================================
RCS file: qt/images/printer.png
diff -N qt/images/printer.png
Binary files /dev/null and /tmp/cvsxYVDtd differ
Index: qt/images/quit_16px.png
===================================================================
RCS file: qt/images/quit_16px.png
diff -N qt/images/quit_16px.png
Binary files /dev/null and /tmp/cvskwAMSf differ
Index: qt/images/first.xpm
===================================================================
RCS file: qt/images/first.xpm
diff -N qt/images/first.xpm
--- qt/images/first.xpm 29 Nov 2008 16:41:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-/* XPM */
-static char * prev_xpm[] = {
-"16 16 17 1",
-"* c None",
-". c #000000",
-"+ c #800000",
-"@ c #008000",
-"# c #808000",
-"$ c #000080",
-"% c #800080",
-"& c #008080",
-" c #C0C0C0",
-"= c #808080",
-"- c #FF0000",
-"; c #00FF00",
-"> c #FFFF00",
-", c #0000FF",
-"' c #FF00FF",
-") c #00FFFF",
-"! c #FFFFFF",
-"****************",
-"****************",
-"****************",
-"****************",
-"**.****.****.***",
-"**.***..***..***",
-"**.**...**...***",
-"**.*....*....***",
-"**.**...**...***",
-"**.***..***..***",
-"**.****.****.***",
-"****************",
-"****************",
-"****************",
-"****************",
-"****************"};
Index: qt/images/last.xpm
===================================================================
RCS file: qt/images/last.xpm
diff -N qt/images/last.xpm
--- qt/images/last.xpm 29 Nov 2008 16:41:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-/* XPM */
-static char * next_xpm[] = {
-"16 16 17 1",
-"* c None",
-". c #000000",
-"+ c #800000",
-"@ c #008000",
-"# c #808000",
-"$ c #000080",
-"% c #800080",
-"& c #008080",
-" c #C0C0C0",
-"= c #808080",
-"- c #FF0000",
-"; c #00FF00",
-"> c #FFFF00",
-", c #0000FF",
-"' c #FF00FF",
-") c #00FFFF",
-"! c #FFFFFF",
-"****************",
-"****************",
-"****************",
-"****************",
-"**.****.****.***",
-"**..***..***.***",
-"**...**...**.***",
-"**....*....*.***",
-"**...**...**.***",
-"**..***..***.***",
-"**.****.****.***",
-"****************",
-"****************",
-"****************",
-"****************",
-"****************"};
Index: qt/images/next.xpm
===================================================================
RCS file: qt/images/next.xpm
diff -N qt/images/next.xpm
--- qt/images/next.xpm 29 Nov 2008 16:41:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-/* XPM */
-static char * play_xpm[] = {
-"16 16 17 1",
-"* c None",
-". c #000000",
-"+ c #800000",
-"@ c #008000",
-"# c #808000",
-"$ c #000080",
-"% c #800080",
-"& c #008080",
-" c #C0C0C0",
-"= c #808080",
-"- c #FF0000",
-"; c #00FF00",
-"> c #FFFF00",
-", c #0000FF",
-"' c #FF00FF",
-") c #00FFFF",
-"! c #FFFFFF",
-"****************",
-"****************",
-"***..***********",
-"***....*********",
-"***......*******",
-"***........*****",
-"***..........***",
-"***...........**",
-"***..........***",
-"***........*****",
-"***......*******",
-"***....*********",
-"***..***********",
-"****************",
-"****************",
-"****************"};
Index: qt/images/prev.xpm
===================================================================
RCS file: qt/images/prev.xpm
diff -N qt/images/prev.xpm
--- qt/images/prev.xpm 29 Nov 2008 16:41:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-/* XPM */
-static char * play_xpm[] = {
-"16 16 17 1",
-"* c None",
-". c #000000",
-"+ c #800000",
-"@ c #008000",
-"# c #808000",
-"$ c #000080",
-"% c #800080",
-"& c #008080",
-" c #C0C0C0",
-"= c #808080",
-"- c #FF0000",
-"; c #00FF00",
-"> c #FFFF00",
-", c #0000FF",
-"' c #FF00FF",
-") c #00FFFF",
-"! c #FFFFFF",
-"****************",
-"****************",
-"***********..***",
-"*********....***",
-"*******......***",
-"*****........***",
-"***..........***",
-"**...........***",
-"***..........***",
-"*****........***",
-"*******......***",
-"*********....***",
-"***********..***",
-"****************",
-"****************",
-"****************"};
Index: qt/images/replay.xpm
===================================================================
RCS file: qt/images/replay.xpm
diff -N qt/images/replay.xpm
--- qt/images/replay.xpm 29 Nov 2008 16:41:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-/* XPM */
-static char *replay_xpm[] = {
-"16 16 17 1",
-" c None",
-"B c #000000",
-"C c #800000",
-"D c #008000",
-"E c #808000",
-"F c #000080",
-"G c #800080",
-"H c #008080",
-"I c #C0C0C0",
-"J c #808080",
-"K c #FF0000",
-"L c #00FF00",
-"M c #FFFF00",
-"N c #0000FF",
-"O c #FF00FF",
-"P c #00FFFF",
-"Q c #FFFFFF",
-" ",
-" B ",
-" BB ",
-"BBB BB BB BBBBB ",
-"BBB BB BB BBBBB ",
-" BB BB ",
-" BB B ",
-" BB ",
-" BB ",
-" BB B ",
-" BB BB ",
-" BBBBBBBBBBBBBB ",
-" BBBBBBBBBBBBBB ",
-" BB ",
-" B ",
-" "
-};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Eliot-dev] eliot AUTHORS qt/eliot.qrc qt/main_window.cpp q...,
Olivier Teulière <=