6 new revisions:
Revision: 4670a75cc53e
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 06:28:31 2012
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp...
http://code.google.com/p/uim/source/detail?r=4670a75cc53e
Revision: 8cd28fac4e0c
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 06:32:00 2012
Log: * qt4/toolbar/common-uimstateindicator.cpp...
http://code.google.com/p/uim/source/detail?r=8cd28fac4e0c
Revision: 681ba88c8015
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 13:51:31 2012
Log: * gtk2/toolbar/common-gtk.c...
http://code.google.com/p/uim/source/detail?r=681ba88c8015
Revision: 3fa399c9a95c
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 13:59:20 2012
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp...
http://code.google.com/p/uim/source/detail?r=3fa399c9a95c
Revision: 58cfcf99bca0
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 15:36:54 2012
Log: * gtk2/toolbar/common-gtk.c...
http://code.google.com/p/uim/source/detail?r=58cfcf99bca0
Revision: a79c2404a1cd
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 15:42:14 2012
Log: * gtk2/toolbar/common-gtk.c...
http://code.google.com/p/uim/source/detail?r=a79c2404a1cd
==============================================================================
Revision: 4670a75cc53e
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 06:28:31 2012
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp
- (QUimHelperToolbar::QUimHelperToolbar):
Add connection on modeChanged().
* qt4/toolbar/common-quimhelpertoolbar.h
- (QUimHelperToolbar): Add modeChanged().
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate):
Hide toolbar on direct input (#25695).
* qt4/toolbar/common-uimstateindicator.h
- (UimStateIndicator): Add modeChanged().
* qt4/toolbar/standalone-qt4.cpp
- (UimStandaloneToolbar::UimStandaloneToolbar):
Add connection on modeChanged().
http://code.google.com/p/uim/source/detail?r=4670a75cc53e
Modified:
/qt4/toolbar/common-quimhelpertoolbar.cpp
/qt4/toolbar/common-quimhelpertoolbar.h
/qt4/toolbar/common-uimstateindicator.cpp
/qt4/toolbar/common-uimstateindicator.h
/qt4/toolbar/standalone-qt4.cpp
=======================================
--- /qt4/toolbar/common-quimhelpertoolbar.cpp Wed Jan 11 00:17:24 2012
+++ /qt4/toolbar/common-quimhelpertoolbar.cpp Sat Mar 10 06:28:31 2012
@@ -67,6 +67,8 @@
this, SLOT( slotIndicatorResized() ) );
connect( m_indicator, SIGNAL( menuRequested( QMenu* ) ),
this, SIGNAL( menuRequested( QMenu* ) ) );
+ connect( m_indicator, SIGNAL( modeChanged( bool ) ),
+ this, SIGNAL( modeChanged( bool ) ) );
const QString ICONDIR = UIM_PIXMAPSDIR;
const QString ACTION_ICONDIR = KDE4_ICONDIR "/oxygen/16x16/actions";
=======================================
--- /qt4/toolbar/common-quimhelpertoolbar.h Wed Jan 11 00:17:24 2012
+++ /qt4/toolbar/common-quimhelpertoolbar.h Sat Mar 10 06:28:31 2012
@@ -81,6 +81,7 @@
void quitToolbar();
void toolbarResized();
void menuRequested( QMenu *menu );
+ void modeChanged( bool mode );
protected:
UimStateIndicator *m_indicator;
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Wed Jan 11 00:17:24 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 06:28:31 2012
@@ -156,6 +156,7 @@
}
}
+ bool isDirect = false;
foreach ( const QString &line, lines )
{
const QStringList fields = line.split( '\t',
QString::SkipEmptyParts );
@@ -183,6 +184,9 @@
{
fileName = ICONDIR + '/' + fields[1] + ".png";
}
+ if ( fields[1] == "off" || fields[1].endsWith( "_direct" )
+ || fields[1].endsWith( "_alnum" ) )
+ isDirect = true;
QPixmap icon = QPixmap( fileName );
if (!icon.isNull()) {
QPixmap scaledIcon = icon.scaled( ICON_SIZE, ICON_SIZE,
@@ -229,6 +233,7 @@
}
}
}
+ emit modeChanged( !isDirect );
#ifdef PLASMA_APPLET_UIM
if ( m_layout->count() != prevCount )
=======================================
--- /qt4/toolbar/common-uimstateindicator.h Wed Jan 11 00:17:24 2012
+++ /qt4/toolbar/common-uimstateindicator.h Sat Mar 10 06:28:31 2012
@@ -71,6 +71,7 @@
signals:
void indicatorResized();
void menuRequested( QMenu *menu );
+ void modeChanged( bool mode );
public slots:
void slotStdinActivated();
=======================================
--- /qt4/toolbar/standalone-qt4.cpp Wed Jan 11 00:17:24 2012
+++ /qt4/toolbar/standalone-qt4.cpp Sat Mar 10 06:28:31 2012
@@ -72,7 +72,10 @@
toolbar = new QUimHelperToolbar( this );
toolbar->adjustSize();
toolbar->show();
- connect( toolbar, SIGNAL( toolbarResized() ), this, SLOT(
slotToolbarResized() ) );
+ connect( toolbar, SIGNAL( toolbarResized() ),
+ this, SLOT( slotToolbarResized() ) );
+ connect( toolbar, SIGNAL( modeChanged( bool ) ),
+ this, SLOT( setVisible( bool ) ) );
toolbar->setMargin(TOOLBAR_MARGIN_SIZE);
// Move
==============================================================================
Revision: 8cd28fac4e0c
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 06:32:00 2012
Log: * qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate): Cosmetic change.
http://code.google.com/p/uim/source/detail?r=8cd28fac4e0c
Modified:
/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 06:28:31 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 06:32:00 2012
@@ -180,8 +180,7 @@
uim_scm_symbol_value_bool("toolbar-icon-for-dark-background?");
const QString append = isDarkBg ? "_dark_background" : "";
QString fileName = ICONDIR + '/' + fields[1] + append
+ ".png";
- if ( isDarkBg && !QFile::exists( fileName ) )
- {
+ if ( isDarkBg && !QFile::exists( fileName ) ) {
fileName = ICONDIR + '/' + fields[1] + ".png";
}
if ( fields[1] == "off" || fields[1].endsWith( "_direct" )
==============================================================================
Revision: 681ba88c8015
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 13:51:31 2012
Log: * gtk2/toolbar/common-gtk.c
- (helper_toolbar_prop_list_update):
Hide toolbar on direct input (#25695).
Toolbar needs to restore its position before shown.
* gtk2/toolbar/standalone-gtk.c
- (main): Save position of toolbar.
http://code.google.com/p/uim/source/detail?r=681ba88c8015
Modified:
/gtk2/toolbar/common-gtk.c
/gtk2/toolbar/standalone-gtk.c
=======================================
--- /gtk2/toolbar/common-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/toolbar/common-gtk.c Sat Mar 10 13:51:31 2012
@@ -725,6 +725,8 @@
const gchar *action_id, *is_selected;
GList *prop_buttons, *tool_buttons;
GtkSizeGroup *sg;
+ gboolean is_direct = FALSE;
+ GtkWidget *toplevel;
if (prop_menu_showing)
return;
@@ -765,6 +767,12 @@
button = prop_button_create(widget,
indication_id, iconic_label, tooltip_str);
append_prop_button(widget, button);
+
+ if (!strcmp(indication_id, "off")
+ || g_str_has_suffix(indication_id, "_direct")
+ || g_str_has_suffix(indication_id, "_alnum")) {
+ is_direct = TRUE;
+ }
} else if (!strcmp("leaf", cols[0]) && has_n_strs(cols, 7)) {
indication_id = cols[1];
iconic_label = safe_gettext(cols[2]);
@@ -779,6 +787,17 @@
g_strfreev(cols);
}
}
+ toplevel = gtk_widget_get_toplevel(widget);
+ if (is_direct) {
+ gtk_widget_hide(toplevel);
+ } else {
+ gint x = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(toplevel),
+ "position_x"));
+ gint y = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(toplevel),
+ "position_y"));
+ gtk_window_move(GTK_WINDOW(toplevel), x, y);
+ gtk_widget_show(toplevel);
+ }
/* create tool buttons */
/* FIXME! command menu and buttons should be customizable. */
=======================================
--- /gtk2/toolbar/standalone-gtk.c Wed Jan 11 00:17:24 2012
+++ /gtk2/toolbar/standalone-gtk.c Sat Mar 10 13:51:31 2012
@@ -344,6 +344,12 @@
y = sc_h - h - panel_height; /* FIXME! */
helper_win_set_position(window, x, y);
}
+ {
+ gint x, y;
+ gtk_window_get_position(GTK_WINDOW(window), &x, &y);
+ g_object_set_data(G_OBJECT(window), "position_x", GINT_TO_POINTER(x));
+ g_object_set_data(G_OBJECT(window), "position_y", GINT_TO_POINTER(y));
+ }
gtk_main();
==============================================================================
Revision: 3fa399c9a95c
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 13:59:20 2012
Log: * qt4/toolbar/common-quimhelpertoolbar.cpp
- Revert 4670a75cc53e29660ac61a1877f6bd084fe8e314.
* qt4/toolbar/common-quimhelpertoolbar.h
- Revert 4670a75cc53e29660ac61a1877f6bd084fe8e314.
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate):
Change implementation. Don't use signal.
* qt4/toolbar/common-uimstateindicator.h
- Revert 4670a75cc53e29660ac61a1877f6bd084fe8e314.
* qt4/toolbar/standalone-qt4.cpp
- Revert 4670a75cc53e29660ac61a1877f6bd084fe8e314.
http://code.google.com/p/uim/source/detail?r=3fa399c9a95c
Modified:
/qt4/toolbar/common-quimhelpertoolbar.cpp
/qt4/toolbar/common-quimhelpertoolbar.h
/qt4/toolbar/common-uimstateindicator.cpp
/qt4/toolbar/common-uimstateindicator.h
/qt4/toolbar/standalone-qt4.cpp
=======================================
--- /qt4/toolbar/common-quimhelpertoolbar.cpp Sat Mar 10 06:28:31 2012
+++ /qt4/toolbar/common-quimhelpertoolbar.cpp Sat Mar 10 13:59:20 2012
@@ -67,8 +67,6 @@
this, SLOT( slotIndicatorResized() ) );
connect( m_indicator, SIGNAL( menuRequested( QMenu* ) ),
this, SIGNAL( menuRequested( QMenu* ) ) );
- connect( m_indicator, SIGNAL( modeChanged( bool ) ),
- this, SIGNAL( modeChanged( bool ) ) );
const QString ICONDIR = UIM_PIXMAPSDIR;
const QString ACTION_ICONDIR = KDE4_ICONDIR "/oxygen/16x16/actions";
=======================================
--- /qt4/toolbar/common-quimhelpertoolbar.h Sat Mar 10 06:28:31 2012
+++ /qt4/toolbar/common-quimhelpertoolbar.h Sat Mar 10 13:59:20 2012
@@ -81,7 +81,6 @@
void quitToolbar();
void toolbarResized();
void menuRequested( QMenu *menu );
- void modeChanged( bool mode );
protected:
UimStateIndicator *m_indicator;
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 06:32:00 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 13:59:20 2012
@@ -40,6 +40,7 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
+#include <QtGui/QApplication>
#include <QtGui/QHBoxLayout>
#include <QtGui/QMouseEvent>
#include <QtGui/QPixmap>
@@ -232,7 +233,12 @@
}
}
}
- emit modeChanged( !isDirect );
+ foreach ( QWidget *widget, QApplication::topLevelWidgets() ) {
+ if ( widget->isAncestorOf( this ) ) {
+ widget->setVisible( !isDirect );
+ break;
+ }
+ }
#ifdef PLASMA_APPLET_UIM
if ( m_layout->count() != prevCount )
=======================================
--- /qt4/toolbar/common-uimstateindicator.h Sat Mar 10 06:28:31 2012
+++ /qt4/toolbar/common-uimstateindicator.h Sat Mar 10 13:59:20 2012
@@ -71,7 +71,6 @@
signals:
void indicatorResized();
void menuRequested( QMenu *menu );
- void modeChanged( bool mode );
public slots:
void slotStdinActivated();
=======================================
--- /qt4/toolbar/standalone-qt4.cpp Sat Mar 10 06:28:31 2012
+++ /qt4/toolbar/standalone-qt4.cpp Sat Mar 10 13:59:20 2012
@@ -72,10 +72,7 @@
toolbar = new QUimHelperToolbar( this );
toolbar->adjustSize();
toolbar->show();
- connect( toolbar, SIGNAL( toolbarResized() ),
- this, SLOT( slotToolbarResized() ) );
- connect( toolbar, SIGNAL( modeChanged( bool ) ),
- this, SLOT( setVisible( bool ) ) );
+ connect( toolbar, SIGNAL( toolbarResized() ), this, SLOT(
slotToolbarResized() ) );
toolbar->setMargin(TOOLBAR_MARGIN_SIZE);
// Move
==============================================================================
Revision: 58cfcf99bca0
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 15:36:54 2012
Log: * gtk2/toolbar/common-gtk.c
- (helper_toolbar_prop_list_update): Change behavior of toolbar display
based on "toolbar-display-time".
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate): Ditto.
* scm/im-custom.scm
- Add custom group "toolbar-display".
- Add custom "toolbar-display-time".
http://code.google.com/p/uim/source/detail?r=58cfcf99bca0
Modified:
/gtk2/toolbar/common-gtk.c
/qt4/toolbar/common-uimstateindicator.cpp
/scm/im-custom.scm
=======================================
--- /gtk2/toolbar/common-gtk.c Sat Mar 10 13:51:31 2012
+++ /gtk2/toolbar/common-gtk.c Sat Mar 10 15:36:54 2012
@@ -725,7 +725,8 @@
const gchar *action_id, *is_selected;
GList *prop_buttons, *tool_buttons;
GtkSizeGroup *sg;
- gboolean is_direct = FALSE;
+ char *display_time;
+ gboolean is_hidden;
GtkWidget *toplevel;
if (prop_menu_showing)
@@ -749,6 +750,9 @@
g_object_set_data(G_OBJECT(widget), OBJECT_DATA_TOOL_BUTTONS, NULL);
}
+ display_time
+ = uim_scm_c_symbol( uim_scm_symbol_value( "toolbar-display-time" )
);
+ is_hidden = strcmp(display_time, "mode");
for (i = 0; lines[i] && strcmp("", lines[i]); i++) {
gchar *utf8_str = convert_charset(charset, lines[i]);
@@ -768,10 +772,10 @@
indication_id, iconic_label, tooltip_str);
append_prop_button(widget, button);
- if (!strcmp(indication_id, "off")
+ if (!is_hidden && (!strcmp(indication_id, "off")
|| g_str_has_suffix(indication_id, "_direct")
- || g_str_has_suffix(indication_id, "_alnum")) {
- is_direct = TRUE;
+ || g_str_has_suffix(indication_id, "_alnum"))) {
+ is_hidden = TRUE;
}
} else if (!strcmp("leaf", cols[0]) && has_n_strs(cols, 7)) {
indication_id = cols[1];
@@ -788,7 +792,8 @@
}
}
toplevel = gtk_widget_get_toplevel(widget);
- if (is_direct) {
+ is_hidden = (is_hidden && strcmp(display_time, "always"));
+ if (is_hidden) {
gtk_widget_hide(toplevel);
} else {
gint x = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(toplevel),
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 13:59:20 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 15:36:54 2012
@@ -157,7 +157,9 @@
}
}
- bool isDirect = false;
+ char *display_time
+ = uim_scm_c_symbol( uim_scm_symbol_value( "toolbar-display-time" )
);
+ bool isHidden = strcmp( display_time, "mode" );
foreach ( const QString &line, lines )
{
const QStringList fields = line.split( '\t',
QString::SkipEmptyParts );
@@ -184,9 +186,11 @@
if ( isDarkBg && !QFile::exists( fileName ) ) {
fileName = ICONDIR + '/' + fields[1] + ".png";
}
- if ( fields[1] == "off" || fields[1].endsWith( "_direct" )
- || fields[1].endsWith( "_alnum" ) )
- isDirect = true;
+ if ( !isHidden
+ && (fields[1] == "off" ||
fields[1].endsWith( "_direct" )
+ || fields[1].endsWith( "_alnum" ) ) ) {
+ isHidden = true;
+ }
QPixmap icon = QPixmap( fileName );
if (!icon.isNull()) {
QPixmap scaledIcon = icon.scaled( ICON_SIZE, ICON_SIZE,
@@ -235,7 +239,7 @@
}
foreach ( QWidget *widget, QApplication::topLevelWidgets() ) {
if ( widget->isAncestorOf( this ) ) {
- widget->setVisible( !isDirect );
+ widget->setHidden( isHidden && strcmp( display_time, "always" )
);
break;
}
}
=======================================
--- /scm/im-custom.scm Wed Jan 11 00:17:24 2012
+++ /scm/im-custom.scm Sat Mar 10 15:36:54 2012
@@ -135,6 +135,11 @@
(N_ "Icon")
(N_ "long description will be here."))
+;; subgroup
+(define-custom-group 'toolbar-display
+ (N_ "Display behavior")
+ (N_ "long description will be here."))
+
;; subgroup
(define-custom-group 'toolbar-widget
(N_ "Toolbar")
@@ -442,6 +447,21 @@
(if enable-lazy-loading?
(require "lazy-load.scm"))))
+(define-custom 'toolbar-display-time 'always
+ '(toolbar toolbar-display)
+ (list 'choice
+ (list 'always
+ (N_ "Always")
+ (N_ "long description will be here."))
+ (list 'mode
+ (N_ "Based on mode")
+ (N_ "long description will be here."))
+ (list 'never
+ (N_ "Never")
+ (N_ "long description will be here.")))
+ (N_ "Display")
+ (N_ "long description will be here."))
+
;;
;; toolbar buttons
;;
==============================================================================
Revision: a79c2404a1cd
Author: nogu.dev <[email protected]>
Date: Sat Mar 10 15:42:14 2012
Log: * gtk2/toolbar/common-gtk.c
- (helper_toolbar_prop_list_update):
Don't hide toolbar even when indication_id has suffix "_alnum".
* qt4/toolbar/common-uimstateindicator.cpp
- (UimStateIndicator::propListUpdate): Ditto.
http://code.google.com/p/uim/source/detail?r=a79c2404a1cd
Modified:
/gtk2/toolbar/common-gtk.c
/qt4/toolbar/common-uimstateindicator.cpp
=======================================
--- /gtk2/toolbar/common-gtk.c Sat Mar 10 15:36:54 2012
+++ /gtk2/toolbar/common-gtk.c Sat Mar 10 15:42:14 2012
@@ -773,8 +773,7 @@
append_prop_button(widget, button);
if (!is_hidden && (!strcmp(indication_id, "off")
- || g_str_has_suffix(indication_id, "_direct")
- || g_str_has_suffix(indication_id, "_alnum"))) {
+ || g_str_has_suffix(indication_id, "_direct"))) {
is_hidden = TRUE;
}
} else if (!strcmp("leaf", cols[0]) && has_n_strs(cols, 7)) {
=======================================
--- /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 15:36:54 2012
+++ /qt4/toolbar/common-uimstateindicator.cpp Sat Mar 10 15:42:14 2012
@@ -186,9 +186,8 @@
if ( isDarkBg && !QFile::exists( fileName ) ) {
fileName = ICONDIR + '/' + fields[1] + ".png";
}
- if ( !isHidden
- && (fields[1] == "off" ||
fields[1].endsWith( "_direct" )
- || fields[1].endsWith( "_alnum" ) ) ) {
+ if ( !isHidden && (fields[1] == "off"
+ || fields[1].endsWith( "_direct" ) ) ) {
isHidden = true;
}
QPixmap icon = QPixmap( fileName );
