From: Enrico Forestieri Date: Sat, 28 Mar 2015 22:18:22 +0000 (+0100) Subject: Provide icons for the outline-* lfuns. X-Git-Tag: 2.2.0alpha1~1092 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cb899b3fa2c733e21b832e3d217ecd2c254d68c8;p=features.git 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 1abcae3c28..a39b41911b 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 b4b79f11f5..0000000000 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 0000000000..dffc76db65 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 0000000000..b4b79f11f5 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 0000000000..dad4be13ed 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 0000000000..953417e9dd 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 dad4be13ed..0000000000 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 fd3db3d203..0000000000 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 8bd482839c..0000000000 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 0000000000..516de37a48 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 0000000000..db3a4abca8 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 0000000000..fd3db3d203 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 0000000000..8bd482839c 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 0000000000..4db79f6dbc 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 0000000000..4542492463 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 0000000000..ae33d51c94 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 0000000000..e8e81555b6 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 afafa7ec39..0000000000 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 0000000000..5de77d2567 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 0000000000..afafa7ec39 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 0000000000..a07581b075 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 0000000000..ed596d7ee0 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 a07581b075..0000000000 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 4db79f6dbc..0000000000 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 4542492463..0000000000 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 d0ea0d3030..c3b9e034ac 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 8491a12552..c95716a5ae 100644 --- a/src/frontends/qt4/ui/TocUi.ui +++ b/src/frontends/qt4/ui/TocUi.ui @@ -125,7 +125,7 @@ ... - ../../../../lib/images/promote.png + ../../../../lib/images/outline-out.png @@ -144,7 +144,7 @@ ... - ../../../../lib/images/demote.png + ../../../../lib/images/outline-in.png @@ -163,7 +163,7 @@ ... - ../../../../lib/images/down.png + ../../../../lib/images/outline-down.png @@ -182,7 +182,7 @@ ... - ../../../../lib/images/up.png + ../../../../lib/images/outline-up.png