mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-26 01:31:30 -05:00
modifed main window to remove unfinished features.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@465 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
6c90e1ad67
commit
da08515d28
@ -204,10 +204,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
||||
connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
|
||||
|
||||
#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
|
||||
addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
|
||||
#endif
|
||||
|
||||
toolAct = ui.toolBarservice->toggleViewAction();
|
||||
toolAct->setText("Service");
|
||||
@ -248,18 +248,17 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
|
||||
|
||||
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);
|
||||
|
||||
/* Create the actions that will go in the tray menu */
|
||||
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...
|
||||
* (no help!)
|
||||
|
@ -1065,6 +1065,9 @@
|
||||
</attribute>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="toolBar_2" >
|
||||
<property name="enabled" >
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="windowTitle" >
|
||||
<string>toolBar_2</string>
|
||||
</property>
|
||||
@ -1080,11 +1083,16 @@
|
||||
<addaction name="actionAdd_Friend" />
|
||||
<addaction name="actionInvite_Friend" />
|
||||
<addaction name="actionAdd_Share" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="actionMessenger" />
|
||||
<addaction name="actionSMPlayer" />
|
||||
<addaction name="actionOptions" />
|
||||
<addaction name="actionColor" />
|
||||
<addaction name="actionAbout" />
|
||||
<addaction name="actionOptions" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="separator" />
|
||||
<addaction name="actionQuit" />
|
||||
</widget>
|
||||
@ -1129,12 +1137,18 @@
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionColor" >
|
||||
<property name="enabled" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon" >
|
||||
<iconset resource="images.qrc" >:/images/highlight.png</iconset>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string>Color</string>
|
||||
</property>
|
||||
<property name="visible" >
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSMPlayer" >
|
||||
<property name="icon" >
|
||||
|
Loading…
x
Reference in New Issue
Block a user