Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 01:31:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

modifed main window to remove unfinished features.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-04-03 14:36:29 +00:00
parent 6c90e1ad67
commit da08515d28
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -204,10 +204,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList ))); connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
#ifdef RS_RELEASE_VERSION #ifdef RS_RELEASE_VERSION
addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow())); //addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#else #else
addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow())); addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif
toolAct = ui.toolBarservice->toggleViewAction(); toolAct = ui.toolBarservice->toggleViewAction();
toolAct->setText("Service"); toolAct->setText("Service");
@ -248,18 +248,17 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.toolBarservice->addSeparator(); ui.toolBarservice->addSeparator();
statusBar()->addWidget(new QLabel(tr("Users: 0 Files: 0 ")));
statusBar()->addPermanentWidget(new QLabel(tr("Down: 0.0 Up: 0.0 ")));
statusBar()->addPermanentWidget(new QLabel(tr("Connections: 0/45 ")));
#endif
//servicegrp->actions()[0]->setChecked(true); //servicegrp->actions()[0]->setChecked(true);
/* Create the actions that will go in the tray menu */ /* Create the actions that will go in the tray menu */
createActions(); createActions();
statusBar()->addWidget(new QLabel(tr("Users: 0 Files: 0 ")));
statusBar()->addPermanentWidget(new QLabel(tr("Down: 0.0 Up: 0.0 ")));
statusBar()->addPermanentWidget(new QLabel(tr("Connections: 0/45 ")));
/****** /******
* This is an annoying warning I get all the time... * This is an annoying warning I get all the time...
* (no help!) * (no help!)

16
retroshare-gui/src/gui/MainWindow.ui
View File

@ -1065,6 +1065,9 @@
</attribute> </attribute>
</widget> </widget>
<widget class="QToolBar" name="toolBar_2" > <widget class="QToolBar" name="toolBar_2" >
<property name="enabled" >
<bool>true</bool>
</property>
<property name="windowTitle" > <property name="windowTitle" >
<string>toolBar_2</string> <string>toolBar_2</string>
</property> </property>
@ -1080,11 +1083,16 @@
<addaction name="actionAdd_Friend" /> <addaction name="actionAdd_Friend" />
<addaction name="actionInvite_Friend" /> <addaction name="actionInvite_Friend" />
<addaction name="actionAdd_Share" /> <addaction name="actionAdd_Share" />
<addaction name="separator" />
<addaction name="separator" />
<addaction name="separator" />
<addaction name="actionMessenger" /> <addaction name="actionMessenger" />
<addaction name="actionSMPlayer" /> <addaction name="actionSMPlayer" />
<addaction name="actionOptions" />
<addaction name="actionColor" /> <addaction name="actionColor" />
<addaction name="actionAbout" /> <addaction name="actionAbout" />
<addaction name="actionOptions" />
<addaction name="separator" />
<addaction name="separator" />
<addaction name="separator" /> <addaction name="separator" />
<addaction name="actionQuit" /> <addaction name="actionQuit" />
</widget> </widget>
@ -1129,12 +1137,18 @@
</property> </property>
</action> </action>
<action name="actionColor" > <action name="actionColor" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="icon" > <property name="icon" >
<iconset resource="images.qrc" >:/images/highlight.png</iconset> <iconset resource="images.qrc" >:/images/highlight.png</iconset>
</property> </property>
<property name="text" > <property name="text" >
<string>Color</string> <string>Color</string>
</property> </property>
<property name="visible" >
<bool>false</bool>
</property>
</action> </action>
<action name="actionSMPlayer" > <action name="actionSMPlayer" >
<property name="icon" > <property name="icon" >