Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Added ApplicationWindow to traymenu for Development version to go faster to the Unfinished Apps.

Browse Source 
* Lots of Layout fixes for ApplicationWindow Dialogs


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-16 22:24:53 +00:00
parent 45f2108fd0
commit 8a2e563c66
19 changed files with 153 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/ApplicationWindow.ui
View File

@ -503,10 +503,19 @@
</rect>
</property>
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<property name="leftMargin" >
<number>6</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="margin" >
<property name="rightMargin" >
<number>6</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>0</number>
</property>
<item row="0" column="0" >

4
retroshare-gui/src/gui/BlogDialog.cpp
View File

@ -41,6 +41,8 @@ BlogDialog::BlogDialog(QWidget *parent)
/* mLayout -> to add widgets to */
mLayout = new QVBoxLayout;
//mLayout->setSpacing(0);
//mLayout->setMargin(0);
QWidget *middleWidget = new QWidget();
middleWidget->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
@ -54,6 +56,8 @@ BlogDialog::BlogDialog(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frame->setLayout(layout2);

4
retroshare-gui/src/gui/BlogDialog.ui
View File

@ -28,13 +28,13 @@
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>9</number>
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label" >

33
retroshare-gui/src/gui/CalDialog.ui
View File

@ -13,6 +13,21 @@
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="spacing" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QTabWidget" name="tab_calendar" >
<property name="tabShape" >
@ -25,6 +40,14 @@
<enum>Qt::ElideNone</enum>
</property>
<widget class="QWidget" name="localCal" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>734</width>
<height>501</height>
</rect>
</property>
<attribute name="title" >
<string>Local Calendars</string>
</attribute>
@ -212,7 +235,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@ -239,6 +262,14 @@
</layout>
</widget>
<widget class="QWidget" name="peerCal" >
<property name="geometry" >
<rect>
<x>26</x>
<y>45</y>
<width>760</width>
<height>509</height>
</rect>
</property>
<attribute name="title" >
<string>Peer Calendars</string>
</attribute>

4
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -77,6 +77,8 @@ ChannelFeed::ChannelFeed(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
chanFrame->setLayout(layout2);
@ -96,6 +98,8 @@ ChannelFeed::ChannelFeed(QWidget *parent)
QVBoxLayout *layout3 = new QVBoxLayout;
layout3->addWidget(scrollArea2);
layout3->setSpacing(0);
layout3->setMargin(0);
msgFrame->setLayout(layout3);

4
retroshare-gui/src/gui/ChannelFeed.ui
View File

@ -22,13 +22,13 @@
<item>
<layout class="QHBoxLayout" >
<property name="leftMargin" >
<number>9</number>
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>9</number>
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="chanButton" >

6
retroshare-gui/src/gui/ForumsDialog.ui
View File

@ -505,6 +505,12 @@
<enum>Qt::DefaultContextMenu</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QSplitter" name="splitter" >
<property name="orientation" >

6
retroshare-gui/src/gui/GamesDialog.ui
View File

@ -13,9 +13,15 @@
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>

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

@ -120,7 +120,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
/*if(!_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()) {
show();
show();
}*/
/* Create all the dialogs of which we only want one instance */
@ -293,6 +293,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
#ifdef RS_RELEASE_VERSION
#else
menu->addAction(_bandwidthAct);
menu->addAction(_appAct);
#endif
menu->addAction(_prefsAct);
menu->addAction(_smplayerAct);
@ -517,6 +518,9 @@ void MainWindow::createActions()
_messengerwindowAct = new QAction(QIcon(IMAGE_RSM16), tr("Open Messenger"), this);
connect(_messengerwindowAct, SIGNAL(triggered()),this, SLOT(showMessengerWindow()));
_appAct = new QAction(QIcon(IMAGE_UNFINISHED), tr("Applications"), this);
connect(_appAct, SIGNAL(triggered()),this, SLOT(showApplWindow()));
_smplayerAct = new QAction(QIcon(IMAGE_SMPLAYER), tr("SMPlayer"), this);
connect(_smplayerAct, SIGNAL(triggered()),this, SLOT(showsmplayer()));

1
retroshare-gui/src/gui/MainWindow.h
View File

@ -174,6 +174,7 @@ private:
QAction* _messengerwindowAct;
QAction* _smplayerAct;
QAction* _helpAct;
QAction* _appAct;
/** A BandwidthGraph object which handles monitoring RetroShare bandwidth usage */
BandwidthGraph* _bandwidthGraph;

2
retroshare-gui/src/gui/MsgFeed.cpp
View File

@ -62,6 +62,8 @@ MsgFeed::MsgFeed(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frame->setLayout(layout2);

33
retroshare-gui/src/gui/MsgFeed.ui
View File

@ -13,8 +13,26 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
@ -42,7 +60,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@ -82,7 +100,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>20</height>
@ -117,7 +135,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@ -145,7 +163,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>20</height>
@ -180,7 +198,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>10</width>
<height>20</height>
@ -212,7 +230,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>81</width>
<height>28</height>
@ -226,7 +244,8 @@
<string>New Msg</string>
</property>
<property name="icon" >
<iconset resource="images.qrc" >:/images/mail_send.png</iconset>
<iconset resource="images.qrc" >
<normaloff>:/images/mail_send.png</normaloff>:/images/mail_send.png</iconset>
</property>
</widget>
</item>

6
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -66,14 +66,16 @@ NewsFeed::NewsFeed(QWidget *parent)
middleWidget->setLayout(mLayout);
QScrollArea *scrollArea = new QScrollArea;
//scrollArea->setBackgroundRole(QPalette::Dark);
QScrollArea *scrollArea = new QScrollArea;
//scrollArea->setBackgroundRole(QPalette::Dark);
scrollArea->setWidget(middleWidget);
scrollArea->setWidgetResizable(true);
scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frame->setLayout(layout2);

4
retroshare-gui/src/gui/NewsFeed.ui
View File

@ -22,13 +22,13 @@
<item row="0" column="0" >
<layout class="QGridLayout" name="gridLayout" >
<property name="leftMargin" >
<number>9</number>
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>9</number>
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>

2
retroshare-gui/src/gui/PeersFeed.cpp
View File

@ -65,6 +65,8 @@ PeersFeed::PeersFeed(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frame->setLayout(layout2);

19
retroshare-gui/src/gui/PeersFeed.ui
View File

@ -13,6 +13,21 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
<item>
@ -42,7 +57,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@ -85,7 +100,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>50</width>
<height>20</height>

6
retroshare-gui/src/gui/PhotoDialog.ui
View File

@ -13,9 +13,15 @@
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
</property>

4
retroshare-gui/src/gui/TransferFeed.cpp
View File

@ -60,6 +60,8 @@ TransferFeed::TransferFeed(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frameDown->setLayout(layout2);
}
@ -82,6 +84,8 @@ TransferFeed::TransferFeed(QWidget *parent)
QVBoxLayout *layout2 = new QVBoxLayout;
layout2->addWidget(scrollArea);
layout2->setSpacing(0);
layout2->setMargin(0);
frameUp->setLayout(layout2);
}

19
retroshare-gui/src/gui/TransferFeed.ui
View File

@ -13,6 +13,21 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>6</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" >
<item>
@ -42,7 +57,7 @@
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@ -70,7 +85,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0" >
<size>
<width>50</width>
<height>20</height>