ツールバーのアイコン画像変更とテキスト表示を追加した

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 2c73548..fe7cdaf 100644 (file)
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -3221,6 +3221,7 @@ public class NeverNote extends QMainWindow{
        logger.log(logger.HIGH, "Entering NeverNote.setupToolBar");
        toolBar = addToolBar(tr("Tool Bar"));   
        toolBar.setObjectName("toolBar");
+       toolBar.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon);
        menuBar.setupToolBarVisible();
        if (!Global.isWindowVisible("toolBar"))
                toolBar.setVisible(false);
@@ -3230,18 +3231,22 @@ public class NeverNote extends QMainWindow{
 //     toolBar.addWidget(menuBar);
 //     menuBar.setSizePolicy(Policy.Minimum, Policy.Minimum);
 //     toolBar.addSeparator();
-       prevButton = toolBar.addAction(tr("Previous"));
+       prevButton = toolBar.addAction(tr(""));
+       prevButton.setToolTip(tr("Previous"));
        QIcon prevIcon = new QIcon(iconPath+"back.png");
        prevButton.setIcon(prevIcon);
        prevButton.triggered.connect(this, "previousViewedAction()");   
        togglePrevArrowButton(Global.isToolbarButtonVisible("prevArrow"));
        
-       nextButton = toolBar.addAction(tr("Next"));
+       nextButton = toolBar.addAction(tr(""));
+       nextButton.setToolTip(tr("Next"));
        QIcon nextIcon = new QIcon(iconPath+"forward.png");
        nextButton.setIcon(nextIcon);
        nextButton.triggered.connect(this, "nextViewedAction()");       
        toggleNextArrowButton(Global.isToolbarButtonVisible("nextArrow"));
        
+       toolBar.addSeparator();
+       
        upButton = toolBar.addAction(tr("Up"));
        QIcon upIcon = new QIcon(iconPath+"up.png");
        upButton.setIcon(upIcon);

diff --git a/src/cx/fbn/nevernote/icons/back.png b/src/cx/fbn/nevernote/icons/back.png
index fd13531..123ebd6 100644 (file)
Binary files a/src/cx/fbn/nevernote/icons/back.png and b/src/cx/fbn/nevernote/icons/back.png differ

diff --git a/src/cx/fbn/nevernote/icons/books.png b/src/cx/fbn/nevernote/icons/books.png
index 066befd..75ec8cd 100644 (file)
Binary files a/src/cx/fbn/nevernote/icons/books.png and b/src/cx/fbn/nevernote/icons/books.png differ

diff --git a/src/cx/fbn/nevernote/icons/delete.png b/src/cx/fbn/nevernote/icons/delete.png
index 93e171f..8394bcd 100644 (file)
Binary files a/src/cx/fbn/nevernote/icons/delete.png and b/src/cx/fbn/nevernote/icons/delete.png differ

diff --git a/src/cx/fbn/nevernote/icons/forward.png b/src/cx/fbn/nevernote/icons/forward.png
index 4072bbd..c552169 100644 (file)
Binary files a/src/cx/fbn/nevernote/icons/forward.png and b/src/cx/fbn/nevernote/icons/forward.png differ

diff --git a/src/cx/fbn/nevernote/icons/new.png b/src/cx/fbn/nevernote/icons/new.png
index cd76a4e..ba5103f 100644 (file)
Binary files a/src/cx/fbn/nevernote/icons/new.png and b/src/cx/fbn/nevernote/icons/new.png differ