summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-02-25 13:28:48 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-02-26 10:41:18 -0300
commit0f56f7c2c5ac1367e42694b34778d6e1b513feb7 (patch)
treec78240692c92d103b42939c89a125a72f439a4f2
parent306b62e7dcf757c2143d5db4380c0be42fd1e16a (diff)
Add Pastebin button to logger window.
Also add png image for the button and license information.
-rw-r--r--LICENSE6
-rw-r--r--data/images/pastebin.pngbin0 -> 2078 bytes
-rw-r--r--data/resources/loggerwindow.qrc1
-rw-r--r--src/leap/bitmask/gui/ui/loggerwindow.ui15
4 files changed, 20 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index c7d0c108..2ccb50e8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -702,3 +702,9 @@ data/images/mail-unlocked.png
License: LGPL - http://www.gnu.org/licenses/lgpl.html
Website: http://www.oxygen-icons.org/
+--
+data/images/pastebin.png
+
+author: Marco Martin
+License: LGPL
+website: https://www.iconfinder.com/icons/7897/binary_icon
diff --git a/data/images/pastebin.png b/data/images/pastebin.png
new file mode 100644
index 00000000..62179840
--- /dev/null
+++ b/data/images/pastebin.png
Binary files differ
diff --git a/data/resources/loggerwindow.qrc b/data/resources/loggerwindow.qrc
index 847ca9a1..a385c50e 100644
--- a/data/resources/loggerwindow.qrc
+++ b/data/resources/loggerwindow.qrc
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
+ <file>../images/pastebin.png</file>
<file>../images/oxygen-icons/edit-bomb.png</file>
<file>../images/oxygen-icons/document-save-as.png</file>
<file>../images/oxygen-icons/dialog-information.png</file>
diff --git a/src/leap/bitmask/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index 3de786f7..b19ed91a 100644
--- a/src/leap/bitmask/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>648</width>
- <height>469</height>
+ <width>769</width>
+ <height>464</height>
</rect>
</property>
<property name="windowTitle">
@@ -154,6 +154,17 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="btnPastebin">
+ <property name="text">
+ <string>Send to Pastebin.com</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../../../../../data/resources/loggerwindow.qrc">
+ <normaloff>:/images/pastebin.png</normaloff>:/images/pastebin.png</iconset>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>