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 == ""))
{
QMessageBox::StandardButton sb = QMessageBox::warning(NULL,
"Add Link Failure",
"Missing Link and/or Title",
QMessageBox::Ok);
QMessageBox::warning(NULL, tr("Add Link Failure"), tr("Missing Link and/or Title"), QMessageBox::Ok);
/* can't do anything */
return;
}

View File

@ -84,11 +84,6 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="1">
<widget class="QPushButton" name="closepushButton">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Cancel</string>
</property>
@ -96,11 +91,6 @@ p, li { white-space: pre-wrap; }
</item>
<item row="1" column="2">
<widget class="QPushButton" name="addLinkButton">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Add Link</string>
</property>
@ -140,37 +130,15 @@ p, li { white-space: pre-wrap; }
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<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;
&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:10pt; font-weight:600; 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-weight:400;&quot;&gt;Title:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Title:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<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;
&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:10pt; font-weight:600; 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-weight:400;&quot;&gt;Url:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Url:</string>
</property>
</widget>
</item>
@ -179,13 +147,7 @@ p, li { white-space: pre-wrap; }
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLineEdit" name="titleLineEdit">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
</widget>
<widget class="QLineEdit" name="titleLineEdit"/>
</item>
<item>
<widget class="QLineEdit" name="linkLineEdit">
@ -195,11 +157,6 @@ p, li { white-space: pre-wrap; }
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
</widget>
</item>
</layout>
@ -230,13 +187,6 @@ border: 1px solid #CCCCCC;}</string>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="anonBox">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Add Anonymous Link</string>
</property>
@ -321,11 +271,6 @@ border: 1px solid #CCCCCC;}</string>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
</item>
</layout>

View File

@ -57,7 +57,7 @@
<item row="0" column="1">
<widget class="QLabel" name="name_label_2">
<property name="text">
<string>Name Label</string>
<string notr="true">Name Label</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@ -112,7 +112,7 @@
<item row="2" column="1">
<widget class="QLabel" name="size_label_2">
<property name="text">
<string>Size Label</string>
<string notr="true">Size Label</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@ -138,7 +138,7 @@
<item row="3" column="1">
<widget class="QLabel" name="status_label_2">
<property name="text">
<string>Status Label</string>
<string notr="true">Status Label</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse</set>
@ -155,7 +155,7 @@
<item row="4" column="1">
<widget class="QLabel" name="priority_label_2">
<property name="text">
<string>Priority Label</string>
<string notr="true">Priority Label</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse</set>
@ -165,7 +165,7 @@
<item row="5" column="1">
<widget class="QLabel" name="type_label_2">
<property name="text">
<string>Type Label</string>
<string notr="true">Type Label</string>
</property>
</widget>
</item>
@ -179,7 +179,7 @@
<item row="1" column="1">
<widget class="QLabel" name="hash_label_2">
<property name="text">
<string>Hash Label</string>
<string notr="true">Hash Label</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
@ -219,21 +219,21 @@
<item row="0" column="1">
<widget class="QLabel" name="sources_line">
<property name="text">
<string>Source Label</string>
<string notr="true">Source Label</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="datarate_line">
<property name="text">
<string>Datarate Label</string>
<string notr="true">Datarate Label</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="completed_line">
<property name="text">
<string>Completed Label</string>
<string notr="true">Completed Label</string>
</property>
</widget>
</item>
@ -253,7 +253,7 @@
<item row="3" column="1">
<widget class="QLabel" name="chunksizelabel">
<property name="text">
<string>Chunks Label</string>
<string notr="true">Chunks Label</string>
</property>
</widget>
</item>
@ -270,7 +270,7 @@
<string>Number of Chunks</string>
</property>
<property name="text">
<string>Chunks Number Label</string>
<string notr="true">Chunks Number Label</string>
</property>
</widget>
</item>
@ -287,11 +287,7 @@
<item row="5" column="1">
<widget class="QLabel" name="remaining_line">
<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;
&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;Remaining Label&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">Remaining Label</string>
</property>
</widget>
</item>
@ -321,7 +317,7 @@ p, li { white-space: pre-wrap; }
<item>
<widget class="QLabel" name="downloadtime_line">
<property name="text">
<string>Download Time Label</string>
<string notr="true">Download Time Label</string>
</property>
</widget>
</item>

View File

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

View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string/>
</property>
<layout class="QGridLayout">
<property name="horizontalSpacing">
@ -88,7 +88,6 @@
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -100,11 +99,6 @@
</item>
<item row="3" column="3">
<widget class="QComboBox" name="rankComboBox">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<item>
<property name="text">
<string>Combo</string>
@ -147,7 +141,6 @@
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -159,11 +152,6 @@
</item>
<item row="3" column="6">
<widget class="QComboBox" name="periodComboBox">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<item>
<property name="text">
<string>Month</string>
@ -210,7 +198,6 @@
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -222,11 +209,6 @@
</item>
<item row="3" column="9">
<widget class="QComboBox" name="fromComboBox">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<item>
<property name="text">
<string>All Peers</string>
@ -264,7 +246,6 @@
<widget class="QLabel" name="label_5">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@ -276,11 +257,6 @@
</item>
<item row="3" column="12">
<widget class="QComboBox" name="topComboBox">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<item>
<property name="text">
<string>Top 100</string>
@ -353,7 +329,7 @@ background: white;}</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<widget class="QWidget" name="layoutWidget_1">
<layout class="QVBoxLayout">
<item>
<layout class="QHBoxLayout">
@ -374,7 +350,6 @@ background: white;}</string>
<widget class="QCheckBox" name="anonBox">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@ -386,11 +361,6 @@ background: white;}</string>
</item>
<item>
<widget class="QPushButton" name="addButton">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>Add Link/Comment</string>
</property>
@ -402,13 +372,6 @@ background: white;}</string>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Title:</string>
</property>
@ -416,11 +379,6 @@ background: white;}</string>
</item>
<item>
<widget class="QLineEdit" name="titleLineEdit">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">QLineEdit{border: 2px solid #CCCCCC;
border-radius: 10px;
@ -430,13 +388,6 @@ background: white;}</string>
</item>
<item>
<widget class="QLabel" name="label_8">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Score:</string>
</property>
@ -497,13 +448,6 @@ background: white;}</string>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>Url:</string>
</property>
@ -511,11 +455,6 @@ background: white;}</string>
</item>
<item>
<widget class="QLineEdit" name="linkLineEdit">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">QLineEdit{border: 2px solid #CCCCCC;
border-radius: 10px;
@ -539,11 +478,6 @@ background: white;}</string>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="styleSheet">
<string notr="true">QTextEdit{border: 2px solid #CCCCCC;
border-radius: 10px;
@ -576,7 +510,7 @@ border: 1px solid #CCCCCC;}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_1">
<property name="margin">
<number>2</number>
</property>

View File

@ -25,9 +25,6 @@
</widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar">
<property name="windowTitle">
<string>toolBar</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
@ -39,9 +36,6 @@
</attribute>
</widget>
<widget class="QToolBar" name="toolBar_2">
<property name="windowTitle">
<string>toolBar_2</string>
</property>
<attribute name="toolBarArea">
<enum>LeftToolBarArea</enum>
</attribute>

View File

@ -210,10 +210,7 @@ border-bottom: 1px solid #CCCCCC;
</size>
</property>
<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;
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>
<string>Add a Friend</string>
</property>
<property name="text">
<string/>
@ -356,11 +353,7 @@ stop:0 #FEFEFE, stop:1 #E8E8E8);
<item>
<widget class="QLineEdit" name="filterPatternLineEdit">
<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;
&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>
<string>Search Friends</string>
</property>
</widget>
</item>

View File

@ -10,9 +10,6 @@
<height>256</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
@ -46,7 +43,7 @@
</sizepolicy>
</property>
<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">&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;
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;
@ -147,8 +144,6 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</widget>
<resources>
<include location="images.qrc"/>
</resources>
<resources/>
<connections/>
</ui>

View File

@ -823,7 +823,7 @@ background: white;}</string>
<string notr="true"/>
</property>
<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">&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;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;

View File

@ -121,9 +121,6 @@ border-image: url(:/images/btn_26_pressed.png) 4;
<property name="styleSheet">
<string notr="true">background-color: transparent;</string>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/rs_wizard.png</pixmap>
</property>
@ -161,7 +158,7 @@ p, li { white-space: pre-wrap; }
<string notr="true"/>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="pageWelcome">
<property name="styleSheet">
@ -471,7 +468,7 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<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">&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;
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;
@ -646,6 +643,15 @@ p, li { white-space: pre-wrap; }
<attribute name="verticalHeaderDefaultSectionSize">
<number>22</number>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderDefaultSectionSize">
<number>22</number>
</attribute>
<attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string>Directory</string>

View File

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

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>PhotoDialog</class>
<widget class="QWidget" name="PhotoDialog">
@ -9,9 +10,6 @@
<height>489</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
@ -31,7 +29,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc" >:/images/image16.png</pixmap>
<pixmap resource="../images.qrc">:/images/image16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -41,10 +39,10 @@
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
<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>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
&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>
&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; font-weight:600;&quot;&gt;Photo View&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@ -148,7 +146,7 @@ p, li { white-space: pre-wrap; }
<string/>
</property>
<property name="icon">
<iconset resource="images.qrc" >
<iconset resource="../images.qrc">
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
</property>
</widget>
@ -162,7 +160,7 @@ p, li { white-space: pre-wrap; }
<string>Add Photo(s)</string>
</property>
<property name="icon">
<iconset resource="images.qrc" >
<iconset resource="../images.qrc">
<normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
</property>
</widget>
@ -193,7 +191,7 @@ p, li { white-space: pre-wrap; }
<string>Update Details</string>
</property>
<property name="icon">
<iconset resource="images.qrc" >
<iconset resource="../images.qrc">
<normaloff>:/images/quick_restart24.png</normaloff>:/images/quick_restart24.png</iconset>
</property>
</widget>

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;") +
tcol(tr("Sets the name and location of RetroShare's logfile.")));
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("|") +"]"));
out << trow(tcol("-"ARG_GUISTYLE" &lt;style&gt;") +
tcol(tr("Sets RetroShare's interface style.") +
@ -403,7 +403,7 @@ bool Rshare::setConfigDirectory(QString dir)
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
Rshare::log(Log::LogLevel level, QString msg)
{