StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Sort res.qrc and remove some unnecessary spaces

Browse Source
This commit is contained in:
Zetok Zalbavar 2014-11-29 11:27:36 +00:00
parent a560909b6d
commit 5d297a78d5
No known key found for this signature in database
GPG Key ID: 53137C3033F09008
4 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

272
res.qrc
View File

@ -6,14 +6,28 @@
<file alias="DejaVuSans.ttf">res/DejaVuSans.ttf</file>
</qresource>
<qresource prefix="/">
<file>img/icon.png</file>
<file>audio/notification.pcm</file>
<file>audio/ToxicIncomingCall.pcm</file>
<file>img/add.png</file>
<file>img/avatar_mask.png</file>
<file>img/contact.png</file>
<file>img/contact_dark.png</file>
<file>img/group.png</file>
<file>img/group_2x.png</file>
<file>img/group_button.png</file>
<file>img/group_dark.png</file>
<file>img/icon.png</file>
<file>img/settings.png</file>
<file>img/settings/av.png</file>
<file>img/settings/general.png</file>
<file>img/settings/identity.png</file>
<file>img/settings/privacy.png</file>
<file>img/status/dot_away.png</file>
<file>img/status/dot_away_2x.png</file>
<file>img/status/dot_away_notification.png</file>
<file>img/status/dot_busy.png</file>
<file>img/status/dot_busy_2x.png</file>
<file>img/status/dot_busy_notification.png</file>
<file>img/status/dot_groupchat.png</file>
<file>img/status/dot_groupchat_newmessages.png</file>
<file>img/status/dot_groupchat_notification.png</file>
@ -23,142 +37,7 @@
<file>img/status/dot_online.png</file>
<file>img/status/dot_online_2x.png</file>
<file>img/status/dot_online_notification.png</file>
<file>img/add.png</file>
<file>img/settings.png</file>
<file>img/transfer.png</file>
<file>ui/acceptFileButton/default.png</file>
<file>ui/acceptFileButton/hover.png</file>
<file>ui/acceptFileButton/pressed.png</file>
<file>ui/acceptFileButton/style.css</file>
<file>ui/callButton/callButton.css</file>
<file>ui/callButton/callButton.png</file>
<file>ui/callButton/callButtonDisabled.png</file>
<file>ui/callButton/callButtonHover.png</file>
<file>ui/callButton/callButtonPressed.png</file>
<file>ui/callButton/callButtonRed.png</file>
<file>ui/callButton/callButtonRedHover.png</file>
<file>ui/callButton/callButtonRedPressed.png</file>
<file>ui/callButton/callButtonYellow.png</file>
<file>ui/callButton/callButtonYellowHover.png</file>
<file>ui/callButton/callButtonYellowPressed.png</file>
<file>ui/chatArea/chatArea.css</file>
<file>ui/chatArea/innerStyle.css</file>
<file>ui/chatArea/scrollBarDownArrow.png</file>
<file>ui/chatArea/scrollBarDownArrowHover.png</file>
<file>ui/chatArea/scrollBarDownArrowPressed.png</file>
<file>ui/chatArea/scrollBarHandle.png</file>
<file>ui/chatArea/scrollBarUpArrow.png</file>
<file>ui/chatArea/scrollBarUpArrowHover.png</file>
<file>ui/chatArea/scrollBarUpArrowPressed.png</file>
<file>ui/emoteButton/emoteButton.css</file>
<file>ui/emoteButton/emoteButton.png</file>
<file>ui/emoteButton/emoteButtonHover.png</file>
<file>ui/emoteButton/emoteButtonPressed.png</file>
<file>ui/fileButton/fileButton.css</file>
<file>ui/fileButton/fileButton.png</file>
<file>ui/fileButton/fileButtonHover.png</file>
<file>ui/fileButton/fileButtonPressed.png</file>
<file>ui/fileButton/fileButtonDisabled.png</file>
<file>ui/msgEdit/msgEdit.css</file>
<file>ui/pauseFileButton/default.png</file>
<file>ui/pauseFileButton/hover.png</file>
<file>ui/pauseFileButton/pressed.png</file>
<file>ui/pauseFileButton/style.css</file>
<file>ui/sendButton/sendButton.css</file>
<file>ui/sendButton/sendButton.png</file>
<file>ui/sendButton/sendButtonHover.png</file>
<file>ui/sendButton/sendButtonPressed.png</file>
<file>ui/stopFileButton/default.png</file>
<file>ui/stopFileButton/hover.png</file>
<file>ui/stopFileButton/pressed.png</file>
<file>ui/stopFileButton/style.css</file>
<file>ui/videoButton/videoButton.css</file>
<file>ui/videoButton/videoButton.png</file>
<file>ui/videoButton/videoButtonDisabled.png</file>
<file>ui/videoButton/videoButtonHover.png</file>
<file>ui/videoButton/videoButtonPressed.png</file>
<file>ui/videoButton/videoButtonRed.png</file>
<file>ui/videoButton/videoButtonRedHover.png</file>
<file>ui/videoButton/videoButtonRedPressed.png</file>
<file>ui/videoButton/videoButtonYellow.png</file>
<file>ui/videoButton/videoButtonYellowHover.png</file>
<file>ui/videoButton/videoButtonYellowPressed.png</file>
<file>img/group_dark.png</file>
<file>ui/window/applicationIcon.png</file>
<file>ui/friendList/friendList.css</file>
<file>ui/window/window.css</file>
<file>img/status/dot_busy.png</file>
<file>img/status/dot_busy_2x.png</file>
<file>img/status/dot_busy_notification.png</file>
<file>translations/fr.qm</file>
<file>translations/ru.qm</file>
<file>ui/fileTransferWidget/fileTransferWidget.css</file>
<file>ui/statusButton/dot_away.png</file>
<file>ui/statusButton/dot_busy.png</file>
<file>ui/statusButton/dot_idle.png</file>
<file>ui/statusButton/dot_online.png</file>
<file>ui/statusButton/statusButton.css</file>
<file>ui/statusButton/menu_indicator.png</file>
<file>translations/de.qm</file>
<file>translations/it.qm</file>
<file>ui/emoticonWidget/dot_page.png</file>
<file>ui/emoticonWidget/dot_page_current.png</file>
<file>ui/emoticonWidget/emoticonWidget.css</file>
<file>ui/emoticonWidget/dot_page_hover.png</file>
<file>ui/volButton/volButton.png</file>
<file>ui/volButton/volButtonHover.png</file>
<file>ui/volButton/volButtonPressed.png</file>
<file>ui/micButton/micButton.png</file>
<file>ui/micButton/micButtonDisabled.png</file>
<file>ui/micButton/micButtonHover.png</file>
<file>ui/micButton/micButtonPressed.png</file>
<file>ui/micButton/micButton.css</file>
<file>ui/volButton/volButton.css</file>
<file>ui/fileTransferInstance/acceptFileButton.png</file>
<file>ui/fileTransferInstance/pauseFileButton.png</file>
<file>ui/fileTransferInstance/pauseGreyFileButton.png</file>
<file>ui/fileTransferInstance/resumeFileButton.png</file>
<file>ui/fileTransferInstance/stopFileButton.png</file>
<file>ui/fileTransferInstance/emptyLGreenFileButton.png</file>
<file>ui/fileTransferInstance/emptyLRedFileButton.png</file>
<file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
<file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
<file>audio/notification.pcm</file>
<file>audio/ToxicIncomingCall.pcm</file>
<file>img/settings/general.png</file>
<file>img/settings/identity.png</file>
<file>img/settings/privacy.png</file>
<file>img/settings/av.png</file>
<file>translations/pl.qm</file>
<file>translations/fi.qm</file>
<file>translations/mannol.qm</file>
<file>translations/uk.qm</file>
<file>img/avatar_mask.png</file>
<file>img/group_2x.png</file>
<file>ui/chatroomWidgets/genericChatroomWidget.css</file>
<file>ui/fileTransferInstance/sliverRTEdge.png</file>
<file>ui/window/statusPanel.css</file>
<file>ui/settings/mainContent.css</file>
<file>ui/settings/mainHead.css</file>
<file>translations/pirate.qm</file>
<file>ui/chatArea/chatHead.css</file>
<file>smileys/krepa098/angry.png</file>
<file>smileys/krepa098/cool.png</file>
<file>smileys/krepa098/crying.png</file>
<file>smileys/krepa098/emoticons.xml</file>
<file>smileys/krepa098/happy.png</file>
<file>smileys/krepa098/Kappa.png</file>
<file>smileys/krepa098/laugh_closed_eyes.png</file>
<file>smileys/krepa098/laugh.png</file>
<file>smileys/krepa098/plain.png</file>
<file>smileys/krepa098/raw.svg</file>
<file>smileys/krepa098/sad.png</file>
<file>smileys/krepa098/scared.png</file>
<file>smileys/krepa098/smile.png</file>
<file>smileys/krepa098/stunned.png</file>
<file>smileys/krepa098/tongue.png</file>
<file>smileys/krepa098/uncertain.png</file>
<file>smileys/krepa098/wink.png</file>
<file>smileys/cylgom/angel.png</file>
<file>smileys/cylgom/angry.png</file>
<file>smileys/cylgom/beer.png</file>
@ -214,7 +93,128 @@
<file>smileys/cylgom/XD.png</file>
<file>smileys/cylgom/XP.png</file>
<file>smileys/cylgom/yawn.png</file>
<file>smileys/krepa098/angry.png</file>
<file>smileys/krepa098/cool.png</file>
<file>smileys/krepa098/crying.png</file>
<file>smileys/krepa098/emoticons.xml</file>
<file>smileys/krepa098/happy.png</file>
<file>smileys/krepa098/Kappa.png</file>
<file>smileys/krepa098/laugh_closed_eyes.png</file>
<file>smileys/krepa098/laugh.png</file>
<file>smileys/krepa098/plain.png</file>
<file>smileys/krepa098/raw.svg</file>
<file>smileys/krepa098/sad.png</file>
<file>smileys/krepa098/scared.png</file>
<file>smileys/krepa098/smile.png</file>
<file>smileys/krepa098/stunned.png</file>
<file>smileys/krepa098/tongue.png</file>
<file>smileys/krepa098/uncertain.png</file>
<file>smileys/krepa098/wink.png</file>
<file>translations/bg.qm</file>
<file>translations/de.qm</file>
<file>translations/fi.qm</file>
<file>translations/fr.qm</file>
<file>translations/it.qm</file>
<file>translations/mannol.qm</file>
<file>translations/pirate.qm</file>
<file>translations/pl.qm</file>
<file>translations/ru.qm</file>
<file>translations/sv.qm</file>
<file>translations/uk.qm</file>
<file>ui/acceptFileButton/default.png</file>
<file>ui/acceptFileButton/hover.png</file>
<file>ui/acceptFileButton/pressed.png</file>
<file>ui/acceptFileButton/style.css</file>
<file>ui/callButton/callButton.css</file>
<file>ui/callButton/callButton.png</file>
<file>ui/callButton/callButtonDisabled.png</file>
<file>ui/callButton/callButtonHover.png</file>
<file>ui/callButton/callButtonPressed.png</file>
<file>ui/callButton/callButtonRed.png</file>
<file>ui/callButton/callButtonRedHover.png</file>
<file>ui/callButton/callButtonRedPressed.png</file>
<file>ui/callButton/callButtonYellow.png</file>
<file>ui/callButton/callButtonYellowHover.png</file>
<file>ui/callButton/callButtonYellowPressed.png</file>
<file>ui/chatArea/chatArea.css</file>
<file>ui/chatArea/chatHead.css</file>
<file>ui/chatArea/innerStyle.css</file>
<file>ui/chatArea/scrollBarDownArrow.png</file>
<file>ui/chatArea/scrollBarDownArrowHover.png</file>
<file>ui/chatArea/scrollBarDownArrowPressed.png</file>
<file>ui/chatArea/scrollBarHandle.png</file>
<file>ui/chatArea/scrollBarUpArrow.png</file>
<file>ui/chatArea/scrollBarUpArrowHover.png</file>
<file>ui/chatArea/scrollBarUpArrowPressed.png</file>
<file>ui/chatroomWidgets/genericChatroomWidget.css</file>
<file>ui/emoteButton/emoteButton.css</file>
<file>ui/emoteButton/emoteButton.png</file>
<file>ui/emoteButton/emoteButtonHover.png</file>
<file>ui/emoteButton/emoteButtonPressed.png</file>
<file>ui/emoticonWidget/dot_page.png</file>
<file>ui/emoticonWidget/dot_page_current.png</file>
<file>ui/emoticonWidget/dot_page_hover.png</file>
<file>ui/emoticonWidget/emoticonWidget.css</file>
<file>ui/fileButton/fileButton.css</file>
<file>ui/fileButton/fileButton.png</file>
<file>ui/fileButton/fileButtonHover.png</file>
<file>ui/fileButton/fileButtonPressed.png</file>
<file>ui/fileButton/fileButtonDisabled.png</file>
<file>ui/fileTransferInstance/acceptFileButton.png</file>
<file>ui/fileTransferInstance/emptyLGreenFileButton.png</file>
<file>ui/fileTransferInstance/emptyLRedFileButton.png</file>
<file>ui/fileTransferInstance/emptyRGreenFileButton.png</file>
<file>ui/fileTransferInstance/emptyRRedFileButton.png</file>
<file>ui/fileTransferInstance/pauseFileButton.png</file>
<file>ui/fileTransferInstance/pauseGreyFileButton.png</file>
<file>ui/fileTransferInstance/resumeFileButton.png</file>
<file>ui/fileTransferInstance/stopFileButton.png</file>
<file>ui/fileTransferInstance/sliverRTEdge.png</file>
<file>ui/fileTransferWidget/fileTransferWidget.css</file>
<file>ui/friendList/friendList.css</file>
<file>ui/micButton/micButton.css</file>
<file>ui/micButton/micButton.png</file>
<file>ui/micButton/micButtonDisabled.png</file>
<file>ui/micButton/micButtonHover.png</file>
<file>ui/micButton/micButtonPressed.png</file>
<file>ui/msgEdit/msgEdit.css</file>
<file>ui/pauseFileButton/default.png</file>
<file>ui/pauseFileButton/hover.png</file>
<file>ui/pauseFileButton/pressed.png</file>
<file>ui/pauseFileButton/style.css</file>
<file>ui/sendButton/sendButton.css</file>
<file>ui/sendButton/sendButton.png</file>
<file>ui/sendButton/sendButtonHover.png</file>
<file>ui/sendButton/sendButtonPressed.png</file>
<file>ui/settings/mainContent.css</file>
<file>ui/settings/mainHead.css</file>
<file>ui/statusButton/dot_away.png</file>
<file>ui/statusButton/dot_busy.png</file>
<file>ui/statusButton/dot_idle.png</file>
<file>ui/statusButton/dot_online.png</file>
<file>ui/statusButton/menu_indicator.png</file>
<file>ui/statusButton/statusButton.css</file>
<file>ui/stopFileButton/default.png</file>
<file>ui/stopFileButton/hover.png</file>
<file>ui/stopFileButton/pressed.png</file>
<file>ui/stopFileButton/style.css</file>
<file>ui/videoButton/videoButton.css</file>
<file>ui/videoButton/videoButton.png</file>
<file>ui/videoButton/videoButtonDisabled.png</file>
<file>ui/videoButton/videoButtonHover.png</file>
<file>ui/videoButton/videoButtonPressed.png</file>
<file>ui/videoButton/videoButtonRed.png</file>
<file>ui/videoButton/videoButtonRedHover.png</file>
<file>ui/videoButton/videoButtonRedPressed.png</file>
<file>ui/videoButton/videoButtonYellow.png</file>
<file>ui/videoButton/videoButtonYellowHover.png</file>
<file>ui/videoButton/videoButtonYellowPressed.png</file>
<file>ui/volButton/volButton.png</file>
<file>ui/volButton/volButtonHover.png</file>
<file>ui/volButton/volButtonPressed.png</file>
<file>ui/volButton/volButton.css</file>
<file>ui/window/applicationIcon.png</file>
<file>ui/window/statusPanel.css</file>
<file>ui/window/window.css</file>
</qresource>
</RCC>

2
src/autoupdate.cpp
View File

@ -428,7 +428,7 @@ void AutoUpdater::checkUpdatesAsyncInteractiveWorker()
return;
if (Widget::getInstance()->askMsgboxQuestion(QObject::tr("Update", "The title of a message box"),
QObject::tr("An update is available, do you want to download it now ?\nIt will be installed when qTox restarts.")))
QObject::tr("An update is available, do you want to download it now?\nIt will be installed when qTox restarts.")))
{
downloadUpdate();
}

2
src/widget/form/addfriendform.cpp
View File

@ -98,7 +98,7 @@ void AddFriendForm::onSendTriggered()
if (Settings::getInstance().getUseProxy())
{
QMessageBox::StandardButton btn = QMessageBox::warning(main, "qTox", tr("qTox needs to use the Tox DNS, but can't do it through a proxy.\n\
Ignore the proxy and connect to the Internet directly ?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
Ignore the proxy and connect to the Internet directly?"), QMessageBox::Ok|QMessageBox::No, QMessageBox::No);
if (btn != QMessageBox::Ok)
return;
}

2
src/widget/toxuri.cpp
View File

@ -79,7 +79,7 @@ ToxURIDialog::ToxURIDialog(QWidget *parent, const QString &userId, const QString
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setWindowTitle(tr("Add a friend","Title of the window to add a friend through Tox URI"));
QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend ?").arg(userId), this);
QLabel *friendsLabel = new QLabel(tr("Do you want to add %1 as a friend?").arg(userId), this);
QLabel *userIdLabel = new QLabel(tr("User ID:"), this);
QLineEdit *userIdEdit = new QLineEdit(userId, this);
userIdEdit->setCursorPosition(0);