Cleaned LinkDialog, MessengerWindow, ImHistoryBrowser, IntroPage, MainWindow, ShareManager, StartDialog and some other small dialogs and updated german translation.

Now the big changes are finished.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3480 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-13 20:05:55 +00:00
parent 81ca05e75e
commit 4fd3ab6123
15 changed files with 4734 additions and 4902 deletions

View file

@ -84,10 +84,7 @@ void AddLinksDialog::addLinkComment()
if ((link == "") || (title == "")) if ((link == "") || (title == ""))
{ {
QMessageBox::StandardButton sb = QMessageBox::warning(NULL, QMessageBox::warning(NULL, tr("Add Link Failure"), tr("Missing Link and/or Title"), QMessageBox::Ok);
"Add Link Failure",
"Missing Link and/or Title",
QMessageBox::Ok);
/* can't do anything */ /* can't do anything */
return; return;
} }

View file

@ -1,343 +1,288 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>AddLinksDialog</class> <class>AddLinksDialog</class>
<widget class="QDialog" name="AddLinksDialog"> <widget class="QDialog" name="AddLinksDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>614</width> <width>614</width>
<height>429</height> <height>429</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Add Link</string> <string>Add Link</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" colspan="4"> <item row="0" column="0" colspan="4">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>52</height> <height>52</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);} <string notr="true">QFrame#frame{background-image: url(:/images/connect/connectFriendBanner.png);}
</string> </string>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="linksiconlabel"> <widget class="QLabel" name="linksiconlabel">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="images.qrc">:/images/irkick.png</pixmap> <pixmap resource="images.qrc">:/images/irkick.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;&quot;&gt;Add Link to Cloud&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'DejaVu Sans'; font-size:18pt; font-weight:600; color:#ffffff;&quot;&gt;Add Link to Cloud&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="4"> <item row="1" column="0" colspan="4">
<widget class="QFrame" name="frame_2"> <widget class="QFrame" name="frame_2">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="1"> <item row="1" column="1">
<widget class="QPushButton" name="closepushButton"> <widget class="QPushButton" name="closepushButton">
<property name="font"> <property name="text">
<font> <string>Cancel</string>
<pointsize>10</pointsize> </property>
</font> </widget>
</property> </item>
<property name="text"> <item row="1" column="2">
<string>Cancel</string> <widget class="QPushButton" name="addLinkButton">
</property> <property name="text">
</widget> <string>Add Link</string>
</item> </property>
<item row="1" column="2"> <property name="autoDefault">
<widget class="QPushButton" name="addLinkButton"> <bool>false</bool>
<property name="font"> </property>
<font> <property name="default">
<pointsize>10</pointsize> <bool>true</bool>
</font> </property>
</property> </widget>
<property name="text"> </item>
<string>Add Link</string> <item row="1" column="0">
</property> <spacer name="horizontalSpacer">
<property name="autoDefault"> <property name="orientation">
<bool>false</bool> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="default"> <property name="sizeHint" stdset="0">
<bool>true</bool> <size>
</property> <width>375</width>
</widget> <height>20</height>
</item> </size>
<item row="1" column="0"> </property>
<spacer name="horizontalSpacer"> </spacer>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item row="0" column="0" colspan="3">
</property> <widget class="QGroupBox" name="groupBox">
<property name="sizeHint" stdset="0"> <property name="title">
<size> <string>Add a new Link</string>
<width>375</width> </property>
<height>20</height> <layout class="QGridLayout" name="gridLayout">
</size> <property name="spacing">
</property> <number>1</number>
</spacer> </property>
</item> <item row="0" column="0">
<item row="0" column="0" colspan="3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<widget class="QGroupBox" name="groupBox"> <item>
<property name="title"> <layout class="QVBoxLayout" name="verticalLayout_2">
<string>Add a new Link</string> <item>
</property> <widget class="QLabel" name="label_6">
<layout class="QGridLayout" name="gridLayout"> <property name="text">
<property name="spacing"> <string>Title:</string>
<number>1</number> </property>
</property> </widget>
<item row="0" column="0"> </item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <item>
<item> <widget class="QLabel" name="label_7">
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="text">
<item> <string>Url:</string>
<widget class="QLabel" name="label_6"> </property>
<property name="font"> </widget>
<font> </item>
<pointsize>10</pointsize> </layout>
<weight>75</weight> </item>
<bold>true</bold> <item>
</font> <layout class="QVBoxLayout" name="verticalLayout">
</property> <item>
<property name="text"> <widget class="QLineEdit" name="titleLineEdit"/>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; </item>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; <item>
p, li { white-space: pre-wrap; } <widget class="QLineEdit" name="linkLineEdit">
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt; <property name="sizePolicy">
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:400;&quot;&gt;Title:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QLabel" name="label_7"> </widget>
<property name="font"> </item>
<font> </layout>
<pointsize>10</pointsize> </item>
<weight>75</weight> </layout>
<bold>true</bold> </item>
</font> <item row="1" column="0">
</property> <widget class="QFrame" name="frame_3">
<property name="text"> <property name="maximumSize">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <size>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; <width>16777215</width>
p, li { white-space: pre-wrap; } <height>40</height>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt; </size>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:400;&quot;&gt;Url:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </property>
</property> <property name="styleSheet">
</widget> <string notr="true">QFrame#frame_3{
</item> background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
</layout> stop:0 #FEFEFE, stop:1 #E8E8E8);
</item>
<item> border: 1px solid #CCCCCC;}</string>
<layout class="QVBoxLayout" name="verticalLayout"> </property>
<item> <property name="frameShape">
<widget class="QLineEdit" name="titleLineEdit"> <enum>QFrame::StyledPanel</enum>
<property name="font"> </property>
<font> <property name="frameShadow">
<pointsize>10</pointsize> <enum>QFrame::Raised</enum>
</font> </property>
</property> <layout class="QHBoxLayout" name="horizontalLayout_2">
</widget> <item>
</item> <widget class="QCheckBox" name="anonBox">
<item> <property name="text">
<widget class="QLineEdit" name="linkLineEdit"> <string>Add Anonymous Link</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </widget>
<horstretch>0</horstretch> </item>
<verstretch>0</verstretch> <item>
</sizepolicy> <widget class="QComboBox" name="scoreBox">
</property> <item>
<property name="font"> <property name="text">
<font> <string>+2 Great!</string>
<pointsize>10</pointsize> </property>
</font> <property name="icon">
</property> <iconset resource="images.qrc">
</widget> <normaloff>:/images/filerating5.png</normaloff>:/images/filerating5.png</iconset>
</item> </property>
</layout> </item>
</item> <item>
</layout> <property name="text">
</item> <string>+1 Good</string>
<item row="1" column="0"> </property>
<widget class="QFrame" name="frame_3"> <property name="icon">
<property name="maximumSize"> <iconset resource="images.qrc">
<size> <normaloff>:/images/filerating4.png</normaloff>:/images/filerating4.png</iconset>
<width>16777215</width> </property>
<height>40</height> </item>
</size> <item>
</property> <property name="text">
<property name="styleSheet"> <string>0 Okay</string>
<string notr="true">QFrame#frame_3{ </property>
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, <property name="icon">
stop:0 #FEFEFE, stop:1 #E8E8E8); <iconset resource="images.qrc">
<normaloff>:/images/filerating3.png</normaloff>:/images/filerating3.png</iconset>
border: 1px solid #CCCCCC;}</string> </property>
</property> </item>
<property name="frameShape"> <item>
<enum>QFrame::StyledPanel</enum> <property name="text">
</property> <string>-1 Sux</string>
<property name="frameShadow"> </property>
<enum>QFrame::Raised</enum> <property name="icon">
</property> <iconset resource="images.qrc">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <normaloff>:/images/filerating2.png</normaloff>:/images/filerating2.png</iconset>
<item> </property>
<widget class="QCheckBox" name="anonBox"> </item>
<property name="font"> <item>
<font> <property name="text">
<pointsize>10</pointsize> <string>-2 Bad Link</string>
<weight>50</weight> </property>
<bold>false</bold> <property name="icon">
</font> <iconset resource="images.qrc">
</property> <normaloff>:/images/filerating1.png</normaloff>:/images/filerating1.png</iconset>
<property name="text"> </property>
<string>Add Anonymous Link</string> </item>
</property> </widget>
</widget> </item>
</item> <item>
<item> <spacer name="horizontalSpacer_2">
<widget class="QComboBox" name="scoreBox"> <property name="orientation">
<item> <enum>Qt::Horizontal</enum>
<property name="text"> </property>
<string>+2 Great!</string> <property name="sizeHint" stdset="0">
</property> <size>
<property name="icon"> <width>299</width>
<iconset resource="images.qrc"> <height>20</height>
<normaloff>:/images/filerating5.png</normaloff>:/images/filerating5.png</iconset> </size>
</property> </property>
</item> </spacer>
<item> </item>
<property name="text"> </layout>
<string>+1 Good</string> </widget>
</property> </item>
<property name="icon"> <item row="2" column="0">
<iconset resource="images.qrc"> <widget class="QTextEdit" name="linkTextEdit">
<normaloff>:/images/filerating4.png</normaloff>:/images/filerating4.png</iconset> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
</item> <horstretch>0</horstretch>
<item> <verstretch>0</verstretch>
<property name="text"> </sizepolicy>
<string>0 Okay</string> </property>
</property> <property name="maximumSize">
<property name="icon"> <size>
<iconset resource="images.qrc"> <width>16777215</width>
<normaloff>:/images/filerating3.png</normaloff>:/images/filerating3.png</iconset> <height>16777215</height>
</property> </size>
</item> </property>
<item> </widget>
<property name="text"> </item>
<string>-1 Sux</string> </layout>
</property> </widget>
<property name="icon"> </item>
<iconset resource="images.qrc"> </layout>
<normaloff>:/images/filerating2.png</normaloff>:/images/filerating2.png</iconset> </widget>
</property> </item>
</item> </layout>
<item> </widget>
<property name="text"> <resources>
<string>-2 Bad Link</string> <include location="images.qrc"/>
</property> </resources>
<property name="icon"> <connections/>
<iconset resource="images.qrc"> </ui>
<normaloff>:/images/filerating1.png</normaloff>:/images/filerating1.png</iconset>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>299</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QTextEdit" name="linkTextEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

View file

@ -1,450 +1,446 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>DetailsDialog</class> <class>DetailsDialog</class>
<widget class="QDialog" name="DetailsDialog"> <widget class="QDialog" name="DetailsDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>525</width> <width>525</width>
<height>477</height> <height>477</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Details</string> <string>Details</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tabgeneral"> <widget class="QWidget" name="tabgeneral">
<attribute name="icon"> <attribute name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/fileinfo.png</normaloff>:/images/fileinfo.png</iconset> <normaloff>:/images/fileinfo.png</normaloff>:/images/fileinfo.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>General</string> <string>General</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="genralgroupBox"> <widget class="QGroupBox" name="genralgroupBox">
<property name="title"> <property name="title">
<string>General</string> <string>General</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="name_label"> <widget class="QLabel" name="name_label">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>File Name:</string> <string>File Name:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="name_label_2"> <widget class="QLabel" name="name_label_2">
<property name="text"> <property name="text">
<string>Name Label</string> <string notr="true">Name Label</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" rowspan="7"> <item row="0" column="2" rowspan="7">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>336</width> <width>336</width>
<height>98</height> <height>98</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="hash_label"> <widget class="QLabel" name="hash_label">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>1677215</width> <width>1677215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Hash:</string> <string>Hash:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="size_label"> <widget class="QLabel" name="size_label">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Size:</string> <string>Size:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLabel" name="size_label_2"> <widget class="QLabel" name="size_label_2">
<property name="text"> <property name="text">
<string>Size Label</string> <string notr="true">Size Label</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="status_label"> <widget class="QLabel" name="status_label">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="layoutDirection"> <property name="layoutDirection">
<enum>Qt::LeftToRight</enum> <enum>Qt::LeftToRight</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Status:</string> <string>Status:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLabel" name="status_label_2"> <widget class="QLabel" name="status_label_2">
<property name="text"> <property name="text">
<string>Status Label</string> <string notr="true">Status Label</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse</set> <set>Qt::LinksAccessibleByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="priority_label"> <widget class="QLabel" name="priority_label">
<property name="text"> <property name="text">
<string>Priority</string> <string>Priority</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="priority_label_2"> <widget class="QLabel" name="priority_label_2">
<property name="text"> <property name="text">
<string>Priority Label</string> <string notr="true">Priority Label</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse</set> <set>Qt::LinksAccessibleByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="type_label_2"> <widget class="QLabel" name="type_label_2">
<property name="text"> <property name="text">
<string>Type Label</string> <string notr="true">Type Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="type_label"> <widget class="QLabel" name="type_label">
<property name="text"> <property name="text">
<string>Type:</string> <string>Type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="hash_label_2"> <widget class="QLabel" name="hash_label_2">
<property name="text"> <property name="text">
<string>Hash Label</string> <string notr="true">Hash Label</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Transfer</string> <string>Transfer</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="sources_label"> <widget class="QLabel" name="sources_label">
<property name="text"> <property name="text">
<string>Sources:</string> <string>Sources:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="datarate_label"> <widget class="QLabel" name="datarate_label">
<property name="text"> <property name="text">
<string>Datarate:</string> <string>Datarate:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="completed_label"> <widget class="QLabel" name="completed_label">
<property name="text"> <property name="text">
<string>Completed:</string> <string>Completed:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="sources_line"> <widget class="QLabel" name="sources_line">
<property name="text"> <property name="text">
<string>Source Label</string> <string notr="true">Source Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLabel" name="datarate_line"> <widget class="QLabel" name="datarate_line">
<property name="text"> <property name="text">
<string>Datarate Label</string> <string notr="true">Datarate Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLabel" name="completed_line"> <widget class="QLabel" name="completed_line">
<property name="text"> <property name="text">
<string>Completed Label</string> <string notr="true">Completed Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" rowspan="7"> <item row="0" column="2" rowspan="7">
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLabel" name="chunksizelabel"> <widget class="QLabel" name="chunksizelabel">
<property name="text"> <property name="text">
<string>Chunks Label</string> <string notr="true">Chunks Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Chunk size:</string> <string>Chunk size:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QLabel" name="numberofchunkslabel"> <widget class="QLabel" name="numberofchunkslabel">
<property name="toolTip"> <property name="toolTip">
<string>Number of Chunks</string> <string>Number of Chunks</string>
</property> </property>
<property name="text"> <property name="text">
<string>Chunks Number Label</string> <string notr="true">Chunks Number Label</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="toolTip"> <property name="toolTip">
<string>Number of Chunks</string> <string>Number of Chunks</string>
</property> </property>
<property name="text"> <property name="text">
<string>Chunks:</string> <string>Chunks:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QLabel" name="remaining_line"> <widget class="QLabel" name="remaining_line">
<property name="text"> <property name="text">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string notr="true">Remaining Label</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; </property>
p, li { white-space: pre-wrap; } </widget>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; </item>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Remaining Label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <item row="5" column="0">
</property> <widget class="QLabel" name="remaining_label">
</widget> <property name="text">
</item> <string>Remaining:</string>
<item row="5" column="0"> </property>
<widget class="QLabel" name="remaining_label"> </widget>
<property name="text"> </item>
<string>Remaining:</string> </layout>
</property> </widget>
</widget> </item>
</item> <item row="2" column="0">
</layout> <widget class="QGroupBox" name="groupBox_3">
</widget> <property name="title">
</item> <string>Date</string>
<item row="2" column="0"> </property>
<widget class="QGroupBox" name="groupBox_3"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="title"> <item>
<string>Date</string> <widget class="QLabel" name="label_4">
</property> <property name="text">
<layout class="QHBoxLayout" name="horizontalLayout"> <string>Download time:</string>
<item> </property>
<widget class="QLabel" name="label_4"> </widget>
<property name="text"> </item>
<string>Download time:</string> <item>
</property> <widget class="QLabel" name="downloadtime_line">
</widget> <property name="text">
</item> <string notr="true">Download Time Label</string>
<item> </property>
<widget class="QLabel" name="downloadtime_line"> </widget>
<property name="text"> </item>
<string>Download Time Label</string> <item>
</property> <spacer name="horizontalSpacer_3">
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item> </property>
<spacer name="horizontalSpacer_3"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>274</width>
</property> <height>20</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>274</width> </spacer>
<height>20</height> </item>
</size> </layout>
</property> </widget>
</spacer> </item>
</item> <item row="3" column="0">
</layout> <spacer name="verticalSpacer">
</widget> <property name="orientation">
</item> <enum>Qt::Vertical</enum>
<item row="3" column="0"> </property>
<spacer name="verticalSpacer"> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Vertical</enum> <width>20</width>
</property> <height>40</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>20</width> </spacer>
<height>40</height> </item>
</size> </layout>
</property> </widget>
</spacer> <widget class="QWidget" name="tabcomments">
</item> <attribute name="icon">
</layout> <iconset resource="images.qrc">
</widget> <normaloff>:/images/filecomments.png</normaloff>:/images/filecomments.png</iconset>
<widget class="QWidget" name="tabcomments"> </attribute>
<attribute name="icon"> <attribute name="title">
<iconset resource="images.qrc"> <string>Comments</string>
<normaloff>:/images/filecomments.png</normaloff>:/images/filecomments.png</iconset> </attribute>
</attribute> <layout class="QGridLayout">
<attribute name="title"> <item row="0" column="0">
<string>Comments</string> <widget class="QTreeView" name="commentsTreeView"/>
</attribute> </item>
<layout class="QGridLayout"> </layout>
<item row="0" column="0"> </widget>
<widget class="QTreeView" name="commentsTreeView"/> <widget class="QWidget" name="tabcomments">
</item> <attribute name="title">
</layout> <string>retroshare link(s)</string>
</widget> </attribute>
<widget class="QWidget" name="tabcomments"> <layout class="QGridLayout">
<attribute name="title"> <item row="0" column="0" colspan="2">
<string>retroshare link(s)</string> <widget class="QGroupBox" name="groupBox">
</attribute> <property name="title">
<layout class="QGridLayout"> <string>retroshare link(s)</string>
<item row="0" column="0" colspan="2"> </property>
<widget class="QGroupBox" name="groupBox"> <layout class="QGridLayout">
<property name="title"> <item row="0" column="0">
<string>retroshare link(s)</string> <widget class="QTextEdit" name="Linktext"/>
</property> </item>
<layout class="QGridLayout"> </layout>
<item row="0" column="0"> </widget>
<widget class="QTextEdit" name="Linktext"/> </item>
</item> <item row="1" column="0">
</layout> <spacer>
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item row="1" column="0"> </property>
<spacer> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>351</width>
</property> <height>20</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>351</width> </spacer>
<height>20</height> </item>
</size> <item row="1" column="1">
</property> <widget class="QPushButton" name="copylinkdetailsButton">
</spacer> <property name="text">
</item> <string>Copy</string>
<item row="1" column="1"> </property>
<widget class="QPushButton" name="copylinkdetailsButton"> </widget>
<property name="text"> </item>
<string>Copy</string> </layout>
</property> </widget>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="0">
</widget> <spacer>
</widget> <property name="orientation">
</item> <enum>Qt::Horizontal</enum>
<item row="1" column="0"> </property>
<spacer> <property name="sizeHint" stdset="0">
<property name="orientation"> <size>
<enum>Qt::Horizontal</enum> <width>321</width>
</property> <height>20</height>
<property name="sizeHint" stdset="0"> </size>
<size> </property>
<width>321</width> </spacer>
<height>20</height> </item>
</size> <item row="1" column="1">
</property> <widget class="QPushButton" name="ok_dButton">
</spacer> <property name="text">
</item> <string>OK</string>
<item row="1" column="1"> </property>
<widget class="QPushButton" name="ok_dButton"> <property name="default">
<property name="text"> <bool>true</bool>
<string>OK</string> </property>
</property> </widget>
<property name="default"> </item>
<bool>true</bool> <item row="1" column="2">
</property> <widget class="QPushButton" name="cancel_dButton">
</widget> <property name="text">
</item> <string>Cancel</string>
<item row="1" column="2"> </property>
<widget class="QPushButton" name="cancel_dButton"> </widget>
<property name="text"> </item>
<string>Cancel</string> </layout>
</property> </widget>
</widget> <resources>
</item> <include location="images.qrc"/>
</layout> </resources>
</widget> <connections/>
<resources> </ui>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

View file

@ -809,14 +809,14 @@ void LinksDialog::toggleWindows( void )
newSizeList.push_back(totalSize); newSizeList.push_back(totalSize);
newSizeList.push_back(0); newSizeList.push_back(0);
ui.expandButton->setIcon(QIcon(QString(":/images/edit_add24.png"))); ui.expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
ui.expandButton->setToolTip("Expand"); ui.expandButton->setToolTip(tr("Expand"));
} }
else else
{ {
newSizeList.push_back(totalSize * 3/4); newSizeList.push_back(totalSize * 3/4);
newSizeList.push_back(totalSize * 1/4); newSizeList.push_back(totalSize * 1/4);
ui.expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png"))); ui.expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
ui.expandButton->setToolTip("Hide"); ui.expandButton->setToolTip(tr("Hide"));
} }
ui.msgSplitter->setSizes(newSizeList); ui.msgSplitter->setSizes(newSizeList);

File diff suppressed because it is too large Load diff

View file

@ -1,150 +1,144 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>571</width> <width>571</width>
<height>450</height> <height>450</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="MainPageStack" name="stackPages" native="true"/> <widget class="MainPageStack" name="stackPages" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">
<property name="windowTitle"> <property name="toolButtonStyle">
<string>toolBar</string> <enum>Qt::ToolButtonTextUnderIcon</enum>
</property> </property>
<property name="toolButtonStyle"> <attribute name="toolBarArea">
<enum>Qt::ToolButtonTextUnderIcon</enum> <enum>TopToolBarArea</enum>
</property> </attribute>
<attribute name="toolBarArea"> <attribute name="toolBarBreak">
<enum>TopToolBarArea</enum> <bool>false</bool>
</attribute> </attribute>
<attribute name="toolBarBreak"> </widget>
<bool>false</bool> <widget class="QToolBar" name="toolBar_2">
</attribute> <attribute name="toolBarArea">
</widget> <enum>LeftToolBarArea</enum>
<widget class="QToolBar" name="toolBar_2"> </attribute>
<property name="windowTitle"> <attribute name="toolBarBreak">
<string>toolBar_2</string> <bool>false</bool>
</property> </attribute>
<attribute name="toolBarArea"> <addaction name="actionAdd_Friend"/>
<enum>LeftToolBarArea</enum> <addaction name="actionAdd_Share"/>
</attribute> <addaction name="separator"/>
<attribute name="toolBarBreak"> <addaction name="actionMessenger"/>
<bool>false</bool> <addaction name="actionAbout"/>
</attribute> <addaction name="actionQuick_Start_Wizard"/>
<addaction name="actionAdd_Friend"/> <addaction name="actionOptions"/>
<addaction name="actionAdd_Share"/> <addaction name="separator"/>
<addaction name="separator"/> <addaction name="actionQuit"/>
<addaction name="actionMessenger"/> </widget>
<addaction name="actionAbout"/> <action name="actionAdd_Friend">
<addaction name="actionQuick_Start_Wizard"/> <property name="icon">
<addaction name="actionOptions"/> <iconset resource="images.qrc">
<addaction name="separator"/> <normaloff>:/images/user/add_user24.png</normaloff>:/images/user/add_user24.png</iconset>
<addaction name="actionQuit"/> </property>
</widget> <property name="text">
<action name="actionAdd_Friend"> <string>Add Friend</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> <property name="toolTip">
<normaloff>:/images/user/add_user24.png</normaloff>:/images/user/add_user24.png</iconset> <string>Add a Friend Wizard</string>
</property> </property>
<property name="text"> </action>
<string>Add Friend</string> <action name="actionAdd_Share">
</property> <property name="icon">
<property name="toolTip"> <iconset resource="images.qrc">
<string>Add a Friend Wizard</string> <normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionAdd_Share"> <string>Add Share</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> </action>
<normaloff>:/images/add-share24.png</normaloff>:/images/add-share24.png</iconset> <action name="actionOptions">
</property> <property name="icon">
<property name="text"> <iconset resource="images.qrc">
<string>Add Share</string> <normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionOptions"> <string>Options</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> </action>
<normaloff>:/images/kcmsystem24.png</normaloff>:/images/kcmsystem24.png</iconset> <action name="actionMessenger">
</property> <property name="icon">
<property name="text"> <iconset resource="images.qrc">
<string>Options</string> <normaloff>:/images/messenger.png</normaloff>:/images/messenger.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionMessenger"> <string>Messenger</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> <property name="visible">
<normaloff>:/images/messenger.png</normaloff>:/images/messenger.png</iconset> <bool>true</bool>
</property> </property>
<property name="text"> </action>
<string>Messenger</string> <action name="actionAbout">
</property> <property name="icon">
<property name="visible"> <iconset resource="images.qrc">
<bool>true</bool> <normaloff>:/images/informations_24x24.png</normaloff>:/images/informations_24x24.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionAbout"> <string>About</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> </action>
<normaloff>:/images/informations_24x24.png</normaloff>:/images/informations_24x24.png</iconset> <action name="actionSMPlayer">
</property> <property name="text">
<property name="text"> <string>SMPlayer</string>
<string>About</string> </property>
</property> </action>
</action> <action name="actionQuit">
<action name="actionSMPlayer"> <property name="icon">
<property name="text"> <iconset resource="images.qrc">
<string>SMPlayer</string> <normaloff>:/images/exit_24x24.png</normaloff>:/images/exit_24x24.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionQuit"> <string>Quit</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> </action>
<normaloff>:/images/exit_24x24.png</normaloff>:/images/exit_24x24.png</iconset> <action name="actionQuick_Start_Wizard">
</property> <property name="icon">
<property name="text"> <iconset resource="images.qrc">
<string>Quit</string> <normaloff>:/images/tools_wizard.png</normaloff>:/images/tools_wizard.png</iconset>
</property> </property>
</action> <property name="text">
<action name="actionQuick_Start_Wizard"> <string>Quick Start Wizard</string>
<property name="icon"> </property>
<iconset resource="images.qrc"> <property name="toolTip">
<normaloff>:/images/tools_wizard.png</normaloff>:/images/tools_wizard.png</iconset> <string>Quick Start Wizard</string>
</property> </property>
<property name="text"> </action>
<string>Quick Start Wizard</string> </widget>
</property> <customwidgets>
<property name="toolTip"> <customwidget>
<string>Quick Start Wizard</string> <class>MainPageStack</class>
</property> <extends>QWidget</extends>
</action> <header location="global">gui/mainpagestack.h</header>
</widget> </customwidget>
<customwidgets> </customwidgets>
<customwidget> <resources>
<class>MainPageStack</class> <include location="images.qrc"/>
<extends>QWidget</extends> </resources>
<header location="global">gui/mainpagestack.h</header> <connections/>
</customwidget> </ui>
</customwidgets>
<resources>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

View file

@ -210,10 +210,7 @@ border-bottom: 1px solid #CCCCCC;
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; <string>Add a Friend</string>
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Add a Friend&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
@ -356,11 +353,7 @@ stop:0 #FEFEFE, stop:1 #E8E8E8);
<item> <item>
<widget class="QLineEdit" name="filterPatternLineEdit"> <widget class="QLineEdit" name="filterPatternLineEdit">
<property name="toolTip"> <property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>Search Friends</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Search Friends&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>

View file

@ -1,154 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>NewsFeed</class> <class>NewsFeed</class>
<widget class="QWidget" name="NewsFeed"> <widget class="QWidget" name="NewsFeed">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>428</width> <width>428</width>
<height>256</height> <height>256</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <layout class="QGridLayout" name="gridLayout_2">
<string>Form</string> <property name="margin">
</property> <number>0</number>
<layout class="QGridLayout" name="gridLayout_2"> </property>
<property name="margin"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <item row="0" column="0">
<number>0</number> <layout class="QGridLayout" name="gridLayout">
</property> <property name="leftMargin">
<item row="0" column="0"> <number>6</number>
<layout class="QGridLayout" name="gridLayout"> </property>
<property name="leftMargin"> <property name="topMargin">
<number>6</number> <number>6</number>
</property> </property>
<property name="topMargin"> <property name="rightMargin">
<number>6</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="horizontalSpacing">
<number>0</number> <number>6</number>
</property> </property>
<property name="horizontalSpacing"> <property name="verticalSpacing">
<number>6</number> <number>0</number>
</property> </property>
<property name="verticalSpacing"> <item row="0" column="0">
<number>0</number> <widget class="QLabel" name="label_2">
</property> <property name="sizePolicy">
<item row="0" column="0"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<widget class="QLabel" name="label_2"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
</property> &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
<property name="text"> p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/konqsidebar_news16.png&quot; /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
p, li { white-space: pre-wrap; } </property>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; </widget>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/images/konqsidebar_news16.png&quot; /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </item>
</property> <item row="0" column="1">
</widget> <widget class="QLabel" name="newslabel">
</item> <property name="sizePolicy">
<item row="0" column="1"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<widget class="QLabel" name="newslabel"> <horstretch>0</horstretch>
<property name="sizePolicy"> <verstretch>0</verstretch>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> </sizepolicy>
<horstretch>0</horstretch> </property>
<verstretch>0</verstretch> <property name="text">
</sizepolicy> <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
</property> &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
<property name="text"> p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;Friends Storm&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
p, li { white-space: pre-wrap; } </property>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt; </widget>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;Friends Storm&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </item>
</property> </layout>
</widget> </item>
</item> <item row="0" column="1">
</layout> <spacer name="horizontalSpacer">
</item> <property name="orientation">
<item row="0" column="1"> <enum>Qt::Horizontal</enum>
<spacer name="horizontalSpacer"> </property>
<property name="orientation"> <property name="sizeHint" stdset="0">
<enum>Qt::Horizontal</enum> <size>
</property> <width>321</width>
<property name="sizeHint" stdset="0"> <height>13</height>
<size> </size>
<width>321</width> </property>
<height>13</height> </spacer>
</size> </item>
</property> <item row="1" column="0" colspan="2">
</spacer> <widget class="QFrame" name="frame">
</item> <property name="frameShape">
<item row="1" column="0" colspan="2"> <enum>QFrame::StyledPanel</enum>
<widget class="QFrame" name="frame"> </property>
<property name="frameShape"> <property name="frameShadow">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::Raised</enum>
</property> </property>
<property name="frameShadow"> <layout class="QGridLayout" name="gridLayout_3">
<enum>QFrame::Raised</enum> <property name="margin">
</property> <number>0</number>
<layout class="QGridLayout" name="gridLayout_3"> </property>
<property name="margin"> <item row="0" column="0">
<number>0</number> <widget class="QScrollArea" name="scrollArea">
</property> <property name="horizontalScrollBarPolicy">
<item row="0" column="0"> <enum>Qt::ScrollBarAlwaysOff</enum>
<widget class="QScrollArea" name="scrollArea"> </property>
<property name="horizontalScrollBarPolicy"> <property name="widgetResizable">
<enum>Qt::ScrollBarAlwaysOff</enum> <bool>true</bool>
</property> </property>
<property name="widgetResizable"> <widget class="QWidget" name="scrollAreaWidgetContents">
<bool>true</bool> <property name="geometry">
</property> <rect>
<widget class="QWidget" name="scrollAreaWidgetContents"> <x>0</x>
<property name="geometry"> <y>0</y>
<rect> <width>424</width>
<x>0</x> <height>229</height>
<y>0</y> </rect>
<width>424</width> </property>
<height>229</height> <layout class="QVBoxLayout" name="verticalLayout_2">
</rect> <property name="spacing">
</property> <number>0</number>
<layout class="QVBoxLayout" name="verticalLayout_2"> </property>
<property name="spacing"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="margin"> <item>
<number>0</number> <layout class="QVBoxLayout" name="verticalLayout"/>
</property> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"/> <spacer name="verticalSpacer">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<spacer name="verticalSpacer"> </property>
<property name="orientation"> <property name="sizeHint" stdset="0">
<enum>Qt::Vertical</enum> <size>
</property> <width>20</width>
<property name="sizeHint" stdset="0"> <height>40</height>
<size> </size>
<width>20</width> </property>
<height>40</height> </spacer>
</size> </item>
</property> </layout>
</spacer> </widget>
</item> </widget>
</layout> </item>
</widget> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> <resources/>
</layout> <connections/>
</widget> </ui>
<resources>
<include location="images.qrc"/>
</resources>
<connections/>
</ui>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -66,7 +66,7 @@
<normaloff>:/images/info16.png</normaloff>:/images/info16.png</iconset> <normaloff>:/images/info16.png</normaloff>:/images/info16.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>Edit Channel Detail</string> <string>Edit Channel Details</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">

View file

@ -1,267 +1,265 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<class>PhotoDialog</class> <ui version="4.0">
<widget class="QWidget" name="PhotoDialog" > <class>PhotoDialog</class>
<property name="geometry" > <widget class="QWidget" name="PhotoDialog">
<rect> <property name="geometry">
<x>0</x> <rect>
<y>0</y> <x>0</x>
<width>561</width> <y>0</y>
<height>489</height> <width>561</width>
</rect> <height>489</height>
</property> </rect>
<property name="windowTitle" > </property>
<string>Form</string> <layout class="QGridLayout">
</property> <property name="leftMargin">
<layout class="QGridLayout" > <number>0</number>
<property name="leftMargin" > </property>
<number>0</number> <property name="topMargin">
</property> <number>6</number>
<property name="topMargin" > </property>
<number>6</number> <property name="rightMargin">
</property> <number>0</number>
<property name="rightMargin" > </property>
<number>0</number> <property name="verticalSpacing">
</property> <number>0</number>
<property name="verticalSpacing" > </property>
<number>0</number> <item row="0" column="0">
</property> <widget class="QLabel" name="photoiconlabel">
<item row="0" column="0" > <property name="text">
<widget class="QLabel" name="photoiconlabel" > <string/>
<property name="text" > </property>
<string/> <property name="pixmap">
</property> <pixmap resource="../images.qrc">:/images/image16.png</pixmap>
<property name="pixmap" > </property>
<pixmap resource="images.qrc" >:/images/image16.png</pixmap> <property name="scaledContents">
</property> <bool>true</bool>
<property name="scaledContents" > </property>
<bool>true</bool> </widget>
</property> </item>
</widget> <item row="0" column="1">
</item> <widget class="QLabel" name="label_7">
<item row="0" column="1" > <property name="text">
<widget class="QLabel" name="label_7" > <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
<property name="text" > p, li { white-space: pre-wrap; }
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css"> &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
p, li { white-space: pre-wrap; } &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Photo View&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> </property>
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:8pt; font-weight:600;">Photo View&lt;/span>&lt;/p>&lt;/body>&lt;/html></string> </widget>
</property> </item>
</widget> <item row="0" column="2">
</item> <spacer>
<item row="0" column="2" > <property name="orientation">
<spacer> <enum>Qt::Horizontal</enum>
<property name="orientation" > </property>
<enum>Qt::Horizontal</enum> <property name="sizeHint" stdset="0">
</property> <size>
<property name="sizeHint" stdset="0" > <width>391</width>
<size> <height>20</height>
<width>391</width> </size>
<height>20</height> </property>
</size> </spacer>
</property> </item>
</spacer> <item row="1" column="0" colspan="3">
</item> <widget class="QSplitter" name="photoSplitter">
<item row="1" column="0" colspan="3" > <property name="orientation">
<widget class="QSplitter" name="photoSplitter" > <enum>Qt::Vertical</enum>
<property name="orientation" > </property>
<enum>Qt::Vertical</enum> <widget class="QWidget" name="layoutWidget">
</property> <layout class="QVBoxLayout">
<widget class="QWidget" name="layoutWidget" > <item>
<layout class="QVBoxLayout" > <widget class="QSplitter" name="splitter">
<item> <property name="orientation">
<widget class="QSplitter" name="splitter" > <enum>Qt::Horizontal</enum>
<property name="orientation" > </property>
<enum>Qt::Horizontal</enum> <widget class="QTreeWidget" name="peerTreeWidget">
</property> <property name="contextMenuPolicy">
<widget class="QTreeWidget" name="peerTreeWidget" > <enum>Qt::CustomContextMenu</enum>
<property name="contextMenuPolicy" > </property>
<enum>Qt::CustomContextMenu</enum> <column>
</property> <property name="text">
<column> <string>Peer</string>
<property name="text" > </property>
<string>Peer</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Slideshow</string>
<property name="text" > </property>
<string>Slideshow</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Photo</string>
<property name="text" > </property>
<string>Photo</string> </column>
</property> </widget>
</column> <widget class="QTreeWidget" name="photoTreeWidget">
</widget> <property name="contextMenuPolicy">
<widget class="QTreeWidget" name="photoTreeWidget" > <enum>Qt::CustomContextMenu</enum>
<property name="contextMenuPolicy" > </property>
<enum>Qt::CustomContextMenu</enum> <column>
</property> <property name="text">
<column> <string>Thumb Image</string>
<property name="text" > </property>
<string>Thumb Image</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Image Name</string>
<property name="text" > </property>
<string>Image Name</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Comment</string>
<property name="text" > </property>
<string>Comment</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Date</string>
<property name="text" > </property>
<string>Date</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Location</string>
<property name="text" > </property>
<string>Location</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>Size</string>
<property name="text" > </property>
<string>Size</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>PeerId</string>
<property name="text" > </property>
<string>PeerId</string> </column>
</property> <column>
</column> <property name="text">
<column> <string>PhotoId</string>
<property name="text" > </property>
<string>PhotoId</string> </column>
</property> </widget>
</column> </widget>
</widget> </item>
</widget> <item>
</item> <layout class="QHBoxLayout">
<item> <item>
<layout class="QHBoxLayout" > <widget class="QPushButton" name="expandButton">
<item> <property name="text">
<widget class="QPushButton" name="expandButton" > <string/>
<property name="text" > </property>
<string/> <property name="icon">
</property> <iconset resource="../images.qrc">
<property name="icon" > <normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
<iconset resource="images.qrc" > </property>
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QPushButton" name="addButton">
<item> <property name="toolTip">
<widget class="QPushButton" name="addButton" > <string>Add Photo(s)</string>
<property name="toolTip" > </property>
<string>Add Photo(s)</string> <property name="text">
</property> <string>Add Photo(s)</string>
<property name="text" > </property>
<string>Add Photo(s)</string> <property name="icon">
</property> <iconset resource="../images.qrc">
<property name="icon" > <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
<iconset resource="images.qrc" > </property>
<normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset> </widget>
</property> </item>
</widget> <item>
</item> <widget class="QPushButton" name="addShowButton">
<item> <property name="text">
<widget class="QPushButton" name="addShowButton" > <string>Add Photo SlideShow</string>
<property name="text" > </property>
<string>Add Photo SlideShow</string> </widget>
</property> </item>
</widget> <item>
</item> <spacer>
<item> <property name="orientation">
<spacer> <enum>Qt::Horizontal</enum>
<property name="orientation" > </property>
<enum>Qt::Horizontal</enum> <property name="sizeHint" stdset="0">
</property> <size>
<property name="sizeHint" stdset="0" > <width>40</width>
<size> <height>20</height>
<width>40</width> </size>
<height>20</height> </property>
</size> </spacer>
</property> </item>
</spacer> <item>
</item> <widget class="QPushButton" name="updateButton">
<item> <property name="text">
<widget class="QPushButton" name="updateButton" > <string>Update Details</string>
<property name="text" > </property>
<string>Update Details</string> <property name="icon">
</property> <iconset resource="../images.qrc">
<property name="icon" > <normaloff>:/images/quick_restart24.png</normaloff>:/images/quick_restart24.png</iconset>
<iconset resource="images.qrc" > </property>
<normaloff>:/images/quick_restart24.png</normaloff>:/images/quick_restart24.png</iconset> </widget>
</property> </item>
</widget> </layout>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> <widget class="QWidget" name="layoutWidget">
</widget> <layout class="QGridLayout">
<widget class="QWidget" name="layoutWidget" > <item row="0" column="0">
<layout class="QGridLayout" > <widget class="QLabel" name="label">
<item row="0" column="0" > <property name="text">
<widget class="QLabel" name="label" > <string>Photo </string>
<property name="text" > </property>
<string>Photo </string> </widget>
</property> </item>
</widget> <item row="0" column="1">
</item> <widget class="QLineEdit" name="photoNameEdit"/>
<item row="0" column="1" > </item>
<widget class="QLineEdit" name="photoNameEdit" /> <item row="1" column="0">
</item> <widget class="QLabel" name="label_3">
<item row="1" column="0" > <property name="text">
<widget class="QLabel" name="label_3" > <string>Date</string>
<property name="text" > </property>
<string>Date</string> </widget>
</property> </item>
</widget> <item row="1" column="1">
</item> <widget class="QLineEdit" name="photoDateEdit"/>
<item row="1" column="1" > </item>
<widget class="QLineEdit" name="photoDateEdit" /> <item row="2" column="0">
</item> <widget class="QLabel" name="label_4">
<item row="2" column="0" > <property name="text">
<widget class="QLabel" name="label_4" > <string>Location</string>
<property name="text" > </property>
<string>Location</string> </widget>
</property> </item>
</widget> <item row="2" column="1">
</item> <widget class="QLineEdit" name="photoLocEdit"/>
<item row="2" column="1" > </item>
<widget class="QLineEdit" name="photoLocEdit" /> <item row="3" column="0">
</item> <widget class="QLabel" name="label_5">
<item row="3" column="0" > <property name="text">
<widget class="QLabel" name="label_5" > <string>Description</string>
<property name="text" > </property>
<string>Description</string> </widget>
</property> </item>
</widget> <item row="3" column="1">
</item> <widget class="QLineEdit" name="photoDescEdit"/>
<item row="3" column="1" > </item>
<widget class="QLineEdit" name="photoDescEdit" /> <item row="4" column="0">
</item> <widget class="QLabel" name="label_2">
<item row="4" column="0" > <property name="text">
<widget class="QLabel" name="label_2" > <string>Comment</string>
<property name="text" > </property>
<string>Comment</string> </widget>
</property> </item>
</widget> <item row="4" column="1">
</item> <widget class="QTextEdit" name="photoCommentEdit"/>
<item row="4" column="1" > </item>
<widget class="QTextEdit" name="photoCommentEdit" /> </layout>
</item> </widget>
</layout> </widget>
</widget> </item>
</widget> </layout>
</item> </widget>
</layout> <resources>
</widget> <include location="../images.qrc"/>
<resources> </resources>
<include location="../images.qrc" /> <connections/>
</resources> </ui>
<connections/>
</ui>

File diff suppressed because it is too large Load diff

View file

@ -216,7 +216,7 @@ Rshare::showUsageMessageBox()
out << trow(tcol("-"ARG_LOGFILE" &lt;file&gt;") + out << trow(tcol("-"ARG_LOGFILE" &lt;file&gt;") +
tcol(tr("Sets the name and location of RetroShare's logfile."))); tcol(tr("Sets the name and location of RetroShare's logfile.")));
out << trow(tcol("-"ARG_LOGLEVEL" &lt;level&gt;") + out << trow(tcol("-"ARG_LOGLEVEL" &lt;level&gt;") +
tcol(tr("Sets the verbosity of Vidalia's logging.") + tcol(tr("Sets the verbosity of RetroShare's logging.") +
"<br>[" + Log::logLevels().join("|") +"]")); "<br>[" + Log::logLevels().join("|") +"]"));
out << trow(tcol("-"ARG_GUISTYLE" &lt;style&gt;") + out << trow(tcol("-"ARG_GUISTYLE" &lt;style&gt;") +
tcol(tr("Sets RetroShare's interface style.") + tcol(tr("Sets RetroShare's interface style.") +
@ -403,7 +403,7 @@ bool Rshare::setConfigDirectory(QString dir)
return true; return true;
} }
/** Writes <b>msg</b> with severity <b>level</b> to Vidalia's log. */ /** Writes <b>msg</b> with severity <b>level</b> to RetroShare's log. */
Log::LogMessage Log::LogMessage
Rshare::log(Log::LogLevel level, QString msg) Rshare::log(Log::LogLevel level, QString msg)
{ {