commit cb899b3fa2c733e21b832e3d217ecd2c254d68c8
Author: Enrico Forestieri <[email protected]>
Date: Sat Mar 28 23:18:22 2015 +0100
Provide icons for the outline-* lfuns.
- Accordingly rename "promote" and "demote" icons.
- Add "outline-down" and "outline-up" icons.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1abcae3..a39b419 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -420,7 +420,6 @@ dist_images_DATA1X = \
images/tab-group-close.png \
images/copy.png \
images/cut.png \
- images/demote.png \
images/depth-decrement.png \
images/depth-increment.png \
images/dialog-preferences.png \
@@ -486,8 +485,11 @@ dist_images_DATA1X = \
images/nomencl-insert.png \
images/note-insert.png \
images/note-next.png \
+ images/outline-down.png \
+ images/outline-in.png \
+ images/outline-out.png \
+ images/outline-up.png \
images/paste.png \
- images/promote.png \
images/redo.png \
images/reload.png \
images/script-insert_subscript.png \
@@ -1775,7 +1777,6 @@ dist_imagesclassic_DATA = \
images/classic/tab-group-close.png \
images/classic/copy.png \
images/classic/cut.png \
- images/classic/demote.png \
images/classic/depth-decrement.png \
images/classic/depth-increment.png \
images/classic/dialog-preferences.png \
@@ -1839,8 +1840,11 @@ dist_imagesclassic_DATA = \
images/classic/nomencl-insert.png \
images/classic/note-insert.png \
images/classic/note-next.png \
+ images/classic/outline-down.png \
+ images/classic/outline-in.png \
+ images/classic/outline-out.png \
+ images/classic/outline-up.png \
images/classic/paste.png \
- images/classic/promote.png \
images/classic/redo.png \
images/classic/reload.png \
images/classic/script-insert_subscript.png \
diff --git a/lib/images/classic/demote.png b/lib/images/classic/demote.png
deleted file mode 100644
index b4b79f1..0000000
Binary files a/lib/images/classic/demote.png and /dev/null differ
diff --git a/lib/images/classic/outline-down.png
b/lib/images/classic/outline-down.png
new file mode 100644
index 0000000..dffc76d
Binary files /dev/null and b/lib/images/classic/outline-down.png differ
diff --git a/lib/images/classic/outline-in.png
b/lib/images/classic/outline-in.png
new file mode 100644
index 0000000..b4b79f1
Binary files /dev/null and b/lib/images/classic/outline-in.png differ
diff --git a/lib/images/classic/outline-out.png
b/lib/images/classic/outline-out.png
new file mode 100644
index 0000000..dad4be1
Binary files /dev/null and b/lib/images/classic/outline-out.png differ
diff --git a/lib/images/classic/outline-up.png
b/lib/images/classic/outline-up.png
new file mode 100644
index 0000000..953417e
Binary files /dev/null and b/lib/images/classic/outline-up.png differ
diff --git a/lib/images/classic/promote.png b/lib/images/classic/promote.png
deleted file mode 100644
index dad4be1..0000000
Binary files a/lib/images/classic/promote.png and /dev/null differ
diff --git a/lib/images/demote.png b/lib/images/demote.png
deleted file mode 100644
index fd3db3d..0000000
Binary files a/lib/images/demote.png and /dev/null differ
diff --git a/lib/images/demote.svgz b/lib/images/demote.svgz
deleted file mode 100644
index 8bd4828..0000000
Binary files a/lib/images/demote.svgz and /dev/null differ
diff --git a/lib/images/outline-down.png b/lib/images/outline-down.png
new file mode 100644
index 0000000..516de37
Binary files /dev/null and b/lib/images/outline-down.png differ
diff --git a/lib/images/outline-down.svgz b/lib/images/outline-down.svgz
new file mode 100644
index 0000000..db3a4ab
Binary files /dev/null and b/lib/images/outline-down.svgz differ
diff --git a/lib/images/outline-in.png b/lib/images/outline-in.png
new file mode 100644
index 0000000..fd3db3d
Binary files /dev/null and b/lib/images/outline-in.png differ
diff --git a/lib/images/outline-in.svgz b/lib/images/outline-in.svgz
new file mode 100644
index 0000000..8bd4828
Binary files /dev/null and b/lib/images/outline-in.svgz differ
diff --git a/lib/images/outline-out.png b/lib/images/outline-out.png
new file mode 100644
index 0000000..4db79f6
Binary files /dev/null and b/lib/images/outline-out.png differ
diff --git a/lib/images/outline-out.svgz b/lib/images/outline-out.svgz
new file mode 100644
index 0000000..4542492
Binary files /dev/null and b/lib/images/outline-out.svgz differ
diff --git a/lib/images/outline-up.png b/lib/images/outline-up.png
new file mode 100644
index 0000000..ae33d51
Binary files /dev/null and b/lib/images/outline-up.png differ
diff --git a/lib/images/outline-up.svgz b/lib/images/outline-up.svgz
new file mode 100644
index 0000000..e8e8155
Binary files /dev/null and b/lib/images/outline-up.svgz differ
diff --git a/lib/images/oxygen/demote.svgz b/lib/images/oxygen/demote.svgz
deleted file mode 100644
index afafa7e..0000000
Binary files a/lib/images/oxygen/demote.svgz and /dev/null differ
diff --git a/lib/images/oxygen/outline-down.svgz
b/lib/images/oxygen/outline-down.svgz
new file mode 100644
index 0000000..5de77d2
Binary files /dev/null and b/lib/images/oxygen/outline-down.svgz differ
diff --git a/lib/images/oxygen/outline-in.svgz
b/lib/images/oxygen/outline-in.svgz
new file mode 100644
index 0000000..afafa7e
Binary files /dev/null and b/lib/images/oxygen/outline-in.svgz differ
diff --git a/lib/images/oxygen/outline-out.svgz
b/lib/images/oxygen/outline-out.svgz
new file mode 100644
index 0000000..a07581b
Binary files /dev/null and b/lib/images/oxygen/outline-out.svgz differ
diff --git a/lib/images/oxygen/outline-up.svgz
b/lib/images/oxygen/outline-up.svgz
new file mode 100644
index 0000000..ed596d7
Binary files /dev/null and b/lib/images/oxygen/outline-up.svgz differ
diff --git a/lib/images/oxygen/promote.svgz b/lib/images/oxygen/promote.svgz
deleted file mode 100644
index a07581b..0000000
Binary files a/lib/images/oxygen/promote.svgz and /dev/null differ
diff --git a/lib/images/promote.png b/lib/images/promote.png
deleted file mode 100644
index 4db79f6..0000000
Binary files a/lib/images/promote.png and /dev/null differ
diff --git a/lib/images/promote.svgz b/lib/images/promote.svgz
deleted file mode 100644
index 4542492..0000000
Binary files a/lib/images/promote.svgz and /dev/null differ
diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index d0ea0d3..c3b9e03 100644
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -52,10 +52,10 @@ TocWidget::TocWidget(GuiView & gui_view, QWidget * parent)
{
setupUi(this);
- moveOutTB->setIcon(QIcon(getPixmap("images/", "promote", "svgz,png")));
- moveInTB->setIcon(QIcon(getPixmap("images/", "demote", "svgz,png")));
- moveUpTB->setIcon(QIcon(getPixmap("images/", "up", "svgz,png")));
- moveDownTB->setIcon(QIcon(getPixmap("images/", "down", "svgz,png")));
+ moveOutTB->setIcon(QIcon(getPixmap("images/", "outline-out",
"svgz,png")));
+ moveInTB->setIcon(QIcon(getPixmap("images/", "outline-in",
"svgz,png")));
+ moveUpTB->setIcon(QIcon(getPixmap("images/", "outline-up",
"svgz,png")));
+ moveDownTB->setIcon(QIcon(getPixmap("images/", "outline-down",
"svgz,png")));
updateTB->setIcon(QIcon(getPixmap("images/", "reload", "svgz,png")));
// avoid flickering
diff --git a/src/frontends/qt4/ui/TocUi.ui b/src/frontends/qt4/ui/TocUi.ui
index 8491a12..c95716a 100644
--- a/src/frontends/qt4/ui/TocUi.ui
+++ b/src/frontends/qt4/ui/TocUi.ui
@@ -125,7 +125,7 @@
<string>...</string>
</property>
<property name="icon" >
- <iconset>../../../../lib/images/promote.png</iconset>
+ <iconset>../../../../lib/images/outline-out.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -144,7 +144,7 @@
<string>...</string>
</property>
<property name="icon" >
- <iconset>../../../../lib/images/demote.png</iconset>
+ <iconset>../../../../lib/images/outline-in.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -163,7 +163,7 @@
<string>...</string>
</property>
<property name="icon" >
- <iconset>../../../../lib/images/down.png</iconset>
+ <iconset>../../../../lib/images/outline-down.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -182,7 +182,7 @@
<string>...</string>
</property>
<property name="icon" >
- <iconset>../../../../lib/images/up.png</iconset>
+ <iconset>../../../../lib/images/outline-up.png</iconset>
</property>
<property name="iconSize" >
<size>
