import com.trolltech.qt.gui.QPushButton;\r
import com.trolltech.qt.gui.QShortcut;\r
import com.trolltech.qt.gui.QTimeEdit;\r
+import com.trolltech.qt.gui.QToolButton;\r
+import com.trolltech.qt.gui.QToolButton.ToolButtonPopupMode;\r
import com.trolltech.qt.gui.QVBoxLayout;\r
import com.trolltech.qt.gui.QWidget;\r
import com.trolltech.qt.network.QNetworkRequest;\r
public EditorButtonBar buttonLayout;\r
public final QComboBox fontList;\r
public final QAction fontListAction;\r
- public final QPushButton fontColor;\r
+ public final QToolButton fontColor;\r
public final QAction fontColorAction;\r
private final ColorMenu fontColorMenu;\r
- public final QPushButton fontHilight;\r
+ public final QToolButton fontHilight;\r
public final QAction fontHilightAction;\r
-// public final ColorComboBox fontHilight;\r
private final ColorMenu fontHilightColorMenu;\r
public final QFileSystemWatcher fileWatcher;\r
public int cursorPosition;\r
}\r
\r
// buttonLayout.addWidget(newSeparator(), 0);\r
- fontColor = newEditorButton("fontColor", tr("Font Color"));\r
+ fontColor = newToolButton("fontColor", tr("Font Color"));\r
fontColorMenu = new ColorMenu(this);\r
fontColor.setMenu(fontColorMenu.getMenu());\r
+ fontColor.setPopupMode(ToolButtonPopupMode.MenuButtonPopup);\r
+ fontColor.setAutoRaise(false);\r
fontColorMenu.getMenu().triggered.connect(this, "fontColorClicked()");\r
fontColorAction = buttonLayout.addWidget(fontColor);\r
buttonLayout.toggleFontColorVisible.triggered.connect(this, "toggleFontColorVisible(Boolean)");\r
- fontHilight = newEditorButton("fontHilight", tr("Font Hilight Color"));\r
+ fontHilight = newToolButton("fontHilight", tr("Font Hilight Color"));\r
+ fontHilight.setPopupMode(ToolButtonPopupMode.MenuButtonPopup);\r
+ fontHilight.setAutoRaise(false);\r
fontHilightColorMenu = new ColorMenu(this);\r
+ fontHilightColorMenu.setDefault(QColor.yellow);\r
fontHilight.setMenu(fontHilightColorMenu.getMenu());\r
fontHilightColorMenu.getMenu().triggered.connect(this, "fontHilightClicked()");\r
fontHilightAction = buttonLayout.addWidget(fontHilight);\r
+ fontHilightColorMenu.setDefault(QColor.yellow);\r
buttonLayout.toggleFontHilight.triggered.connect(this, "toggleFontHilightVisible(Boolean)");\r
\r
// buttonLayout.addWidget(new QLabel(), 1);\r
}\r
\r
\r
+ \r
private void setupShortcut(QShortcut action, String text) {\r
if (!Global.shortcutKeys.containsAction(text))\r
return;\r
button.clicked.connect(this, name + "Clicked()");\r
return button;\r
}\r
+ // New Editor Button\r
+ private QToolButton newToolButton(String name, String toolTip) {\r
+ QToolButton button = new QToolButton();\r
+ QIcon icon = new QIcon(iconPath + name + ".gif");\r
+ button.setIcon(icon);\r
+ button.setToolTip(toolTip);\r
+ button.clicked.connect(this, name + "Clicked()");\r
+ return button;\r
+ }\r
\r
// New Separator\r
private QLabel newSeparator() {\r