Skip to content

Commit

Permalink
Update a few icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed Nov 28, 2015
1 parent dc06b72 commit c056dbc
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 10 deletions.
16 changes: 12 additions & 4 deletions NOTICE
@@ -1,5 +1,13 @@
Apache Imgbrd-Grabber
Copyright 2011-2015 The Apache Software Foundation
Copyright 2011-2015 Bionus

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file modified images/icons/hidden.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/icons/showed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/icons/tab-poolplus.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/icons/tab.png
Binary file not shown.
2 changes: 1 addition & 1 deletion resources.qrc
Expand Up @@ -15,7 +15,6 @@
<file>images/icons/save.png</file>
<file>images/icons/window.png</file>
<file>images/icons/book.png</file>
<file>images/icons/tab.png</file>
<file>images/icons/hidden.png</file>
<file>images/icons/showed.png</file>
<file>images/icons/update.png</file>
Expand Down Expand Up @@ -45,5 +44,6 @@
<file>images/icons/tab-minus.png</file>
<file>images/icons/tab-plus.png</file>
<file>images/icons/bug.png</file>
<file>images/icons/tab-poolplus.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion source/functions.cpp
Expand Up @@ -491,7 +491,7 @@ void log(QString l, Log)

QString v = set.contains("Login/pseudo") && !set.value("Login/pseudo").toString().isEmpty() ? l.replace(set.value("Login/pseudo").toString(), "{pseudo}") : l;
v = set.contains("Login/password") && !set.value("Login/password").toString().isEmpty() ? l.replace(set.value("Login/password").toString(), "{password}") : v;
f.write(QString("["+time.toString("hh:mm:ss.zzz")+"] "+stripTags(v)+"\r\n").toUtf8());
f.write(QString("["+time.toString("hh:mm:ss.zzz")+"] "+stripTags(v)+"\n").toUtf8());
f.flush();

//_log.insert(time, (type == Error ? QObject::tr("<b>Erreur :</b> %1").arg(l) : (type == Warning ? QObject::tr("<b>Attention :</b> %1").arg(l) : (type == Notice ? QObject::tr("<b>Notice :</b> %1").arg(l) : l))));
Expand Down
2 changes: 1 addition & 1 deletion source/pooltab.cpp
Expand Up @@ -678,7 +678,7 @@ void poolTab::contextMenu()
else
{ menu->addAction(QIcon(":/images/icons/add.png"), tr("Garder pour plus tard"), this, SLOT(viewitlater())); }
menu->addSeparator();
menu->addAction(QIcon(":/images/icons/tab.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/tab-plus.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/window.png"), tr("Ouvrir dans une nouvelle fenêtre"), this, SLOT(openInNewWindow()));
}
menu->exec(QCursor::pos());
Expand Down
2 changes: 1 addition & 1 deletion source/tagtab.cpp
Expand Up @@ -877,7 +877,7 @@ void tagTab::contextMenu()
else
{ menu->addAction(QIcon(":/images/icons/add.png"), tr("Garder pour plus tard"), this, SLOT(viewitlater())); }
menu->addSeparator();
menu->addAction(QIcon(":/images/icons/tab.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/tab-plus.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/window.png"), tr("Ouvrir dans une nouvelle fenêtre"), this, SLOT(openInNewWindow()));
}
menu->exec(QCursor::pos());
Expand Down
2 changes: 1 addition & 1 deletion source/zoomwindow.cpp
Expand Up @@ -252,7 +252,7 @@ void zoomWindow::contextMenu(QPoint)
{ menu->addAction(QIcon(":/images/icons/hidden.png"), tr("Ignorer"), this, SLOT(ignore())); }
menu->addSeparator();
// Onglets
menu->addAction(QIcon(":/images/icons/tab.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/tab-plus.png"), tr("Ouvrir dans un nouvel onglet"), this, SLOT(openInNewTab()));
menu->addAction(QIcon(":/images/icons/window.png"), tr("Ouvrir dans une nouvelle fenêtre"), this, SLOT(openInNewWindow()));
menu->addAction(QIcon(":/images/icons/browser.png"), tr("Ouvrir dans le navigateur"), this, SLOT(openInBrowser()));
}
Expand Down
2 changes: 1 addition & 1 deletion ui/aboutwindow.ui
Expand Up @@ -60,7 +60,7 @@
<item>
<widget class="QLabel" name="labelCreator">
<property name="text">
<string>Grabber est une création de Bionus.&lt;br/&gt;N'hésitez pas à visiter le &lt;a href=&quot;http://code.google.com/p/imgbrd-grabber/&quot;&gt;site&lt;/a&gt; pour rester à jour, ou récupérer des fichiers de site ou des traductions.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Grabber est une création de Bionus.&lt;br/&gt;N'hésitez pas à visiter le &lt;a href=&quot;https://github.com/Bionus/imgbrd-grabber&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;site&lt;/span&gt;&lt;/a&gt; pour rester à jour, ou récupérer des fichiers de site ou des traductions.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand Down
4 changes: 4 additions & 0 deletions ui/mainwindow.ui
Expand Up @@ -991,6 +991,10 @@
</property>
</action>
<action name="actionAddpooltab">
<property name="icon">
<iconset resource="../resources.qrc">
<normaloff>:/images/icons/tab-poolplus.png</normaloff>:/images/icons/tab-poolplus.png</iconset>
</property>
<property name="text">
<string>Nouvel onglet pool</string>
</property>
Expand Down

0 comments on commit c056dbc

Please sign in to comment.