December 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42749 - in /trunk/gtk/unstable/src: ygtkimage.c ygtkimage.h
by rpmcruz＠svn.opensuse.org 06 Dec '07

06 Dec '07

Author: rpmcruz Date: Thu Dec 6 05:28:35 2007 New Revision: 42749 URL: http://svn.opensuse.org/viewcvs/yast?rev=42749&view=rev Log: Forgot to commit these two. Added: trunk/gtk/unstable/src/ygtkimage.c trunk/gtk/unstable/src/ygtkimage.h Added: trunk/gtk/unstable/src/ygtkimage.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/ygtkimage.c?rev… ============================================================================== --- trunk/gtk/unstable/src/ygtkimage.c (added) +++ trunk/gtk/unstable/src/ygtkimage.c Thu Dec 6 05:28:35 2007 @@ -0,0 +1,285 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkImage widget */ +// check the header file for information about this widget + +#include <config.h> +#include "ygdkmngloader.h" +#include "ygtkimage.h" +#include <gtk/gtkiconfactory.h> + +G_DEFINE_TYPE (YGtkImage, ygtk_image, GTK_TYPE_DRAWING_AREA) + +static void ygtk_image_init (YGtkImage *image) +{ +} + +static void ygtk_image_free_pixbuf (YGtkImage *image) +{ + if (image->animated) { + if (image->animation) { + g_object_unref (G_OBJECT (image->animation->pixbuf)); + if (image->animation->timeout_id) + g_source_remove (image->animation->timeout_id); + g_free (image->animation); + image->animation = NULL; + } + } + else { + if (image->pixbuf) { + g_object_unref (G_OBJECT (image->pixbuf)); + image->pixbuf = NULL; + } + } +} + +static void ygtk_image_destroy (GtkObject *object) +{ + YGtkImage *image = YGTK_IMAGE (object); + if (image->alt_text) + g_free (image->alt_text); + image->alt_text = NULL; + ygtk_image_free_pixbuf (image); + GTK_OBJECT_CLASS (ygtk_image_parent_class)->destroy (object); +} + +static void ygtk_image_set_pixbuf (YGtkImage *image, GdkPixbuf *pixbuf, const char *error_msg) +{ + ygtk_image_free_pixbuf (image); + gtk_widget_queue_resize (GTK_WIDGET (image)); + + if (pixbuf) { + image->animated = FALSE; + image->pixbuf = pixbuf; + image->loaded = TRUE; + } +/* else + g_warning ("Couldn't load image - %s", error_msg);*/ +} + +static gboolean ygtk_image_advance_frame_cb (gpointer data) +{ + YGtkImage *image = (YGtkImage *) data; + struct _YGtkImageAnimation *animation = image->animation; + + if (!animation->frame) // no frame yet loaded + animation->frame = gdk_pixbuf_animation_get_iter (animation->pixbuf, NULL); + else + if (gdk_pixbuf_animation_iter_advance (animation->frame, NULL)) + gtk_widget_queue_draw (GTK_WIDGET (image)); + + // shedule next frame + int delay = gdk_pixbuf_animation_iter_get_delay_time (animation->frame); + if (delay != -1) + animation->timeout_id = g_timeout_add (delay, ygtk_image_advance_frame_cb, data); + return FALSE; +} + +static void ygtk_image_set_animation (YGtkImage *image, GdkPixbufAnimation *pixbuf, + const char *error_msg) +{ + ygtk_image_free_pixbuf (image); + gtk_widget_queue_resize (GTK_WIDGET (image)); + + if (pixbuf) { + image->animated = TRUE; + image->animation = g_new0 (struct _YGtkImageAnimation, 1); + image->animation->pixbuf = pixbuf; + image->loaded = TRUE; + ygtk_image_advance_frame_cb (image); + } +/* else + g_warning ("Couldn't load image - %s", error_msg);*/ +} + +void ygtk_image_set_from_file (YGtkImage *image, const char *filename, gboolean anim) +{ + GError *error = 0; + if (anim) { + GdkPixbufAnimation *pixbuf; + if (ygdk_mng_pixbuf_is_file_mng (filename)) + pixbuf = ygdk_mng_pixbuf_new_from_file (filename, &error); + else + pixbuf = gdk_pixbuf_animation_new_from_file (filename, &error); + ygtk_image_set_animation (image, pixbuf, error ? error->message : "(undefined)"); + } + else { + GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (filename, &error); + ygtk_image_set_pixbuf (image, pixbuf, error ? error->message : "(undefined)"); + } +} + +static void ygtk_image_loaded_cb (GdkPixbufLoader *loader, YGtkImage *image) +{ + if (image->animated) { + if (image->animation) { + // a new frame loaded -- just redraw the widget + if (gdk_pixbuf_animation_iter_on_currently_loading_frame + (image->animation->frame)) + gtk_widget_queue_draw (GTK_WIDGET (image)); + } + else { + GdkPixbufAnimation *pixbuf = gdk_pixbuf_loader_get_animation (loader); + g_object_ref (G_OBJECT (pixbuf)); + ygtk_image_set_animation (image, pixbuf, "on block data reading callback"); + } + } + else { + GdkPixbuf *pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); + g_object_ref (G_OBJECT (pixbuf)); + ygtk_image_set_pixbuf (image, pixbuf, "on block data reading callback"); + } +} + +void ygtk_image_set_from_data (YGtkImage *image, const guint8 *data, long data_size, gboolean anim) +{ + GError *error = 0; + if (anim && ygdk_mng_pixbuf_is_data_mng (data, data_size)) { + GdkPixbufAnimation *pixbuf; + pixbuf = ygdk_mng_pixbuf_new_from_data (data, data_size, &error); + ygtk_image_set_animation (image, pixbuf, error ? error->message : "(undefined)"); + } + else { + image->animated = anim; + GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); + g_signal_connect (G_OBJECT (loader), "area-prepared", + G_CALLBACK (ygtk_image_loaded_cb), image); + if (!gdk_pixbuf_loader_write (loader, data, data_size, &error)) + g_warning ("Could not load image from data blocks: %s", error->message); + gdk_pixbuf_loader_close (loader, &error); + } +} + +void ygtk_image_set_props (YGtkImage *image, YGtkImageAlign align, const gchar *alt_text) +{ + image->align = align; + if (image->alt_text) + g_free (image->alt_text); + image->alt_text = g_strdup (alt_text); + gtk_widget_queue_draw (GTK_WIDGET (image)); +} + +static void ygtk_image_size_request (GtkWidget *widget, GtkRequisition *requisition) +{ + YGtkImage *image = YGTK_IMAGE (widget); + int width = 0, height = 0; + if (image->loaded) { + if (image->animated) { + width = gdk_pixbuf_animation_get_width (image->animation->pixbuf); + height = gdk_pixbuf_animation_get_height (image->animation->pixbuf); + } + else { + width = gdk_pixbuf_get_width (image->pixbuf); + height = gdk_pixbuf_get_height (image->pixbuf); + } + } + else if (image->alt_text) { + PangoLayout *layout; + layout = gtk_widget_create_pango_layout (widget, image->alt_text); + pango_layout_get_pixel_size (layout, &width, &height); + } + requisition->width = width; + requisition->height = height; +} + +static GdkPixbuf *ygtk_image_render_state (GtkWidget *widget, GdkPixbuf *pixbuf) +{ + // as in GtkImage + GtkIconSource *source = gtk_icon_source_new(); + GdkPixbuf *rendered; + gtk_icon_source_set_pixbuf (source, pixbuf); + gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_icon_source_set_size_wildcarded (source, FALSE); + rendered = gtk_style_render_icon (widget->style, source, + gtk_widget_get_direction (widget), GTK_WIDGET_STATE (widget), + /* arbitrary */ (GtkIconSize)-1, widget, "gtk-image"); + gtk_icon_source_free (source); + return rendered; +} + +static gboolean ygtk_image_expose_event (GtkWidget *widget, GdkEventExpose *event) +{ + YGtkImage *image = YGTK_IMAGE (widget); + int width, height; + width = widget->allocation.width; + height = widget->allocation.height; + + cairo_t *cr = gdk_cairo_create (widget->window); + + if (!image->loaded && image->alt_text) { + // show alt text if no image was loaded + PangoLayout *layout; + layout = gtk_widget_create_pango_layout (widget, image->alt_text); + + int x, y; + x = (width - widget->requisition.width) / 2; + y = (height - widget->requisition.height) / 2; + + cairo_move_to (cr, x, y); + pango_cairo_show_layout (cr, layout); + + g_object_unref (layout); + cairo_destroy (cr); + return TRUE; + } + + GdkPixbuf *pixbuf; + if (image->animated) + pixbuf = gdk_pixbuf_animation_iter_get_pixbuf (image->animation->frame); + else + pixbuf = image->pixbuf; + + gboolean needs_transform = GTK_WIDGET_STATE (widget) != GTK_STATE_NORMAL; + if (needs_transform) + pixbuf = ygtk_image_render_state (widget, pixbuf); + int x = 0, y = 0; + if (image->align == CENTER_IMAGE_ALIGN) { + x = (width - widget->requisition.width) / 2; + y = (height - widget->requisition.height) / 2; + } + + gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y); + + switch (image->align) { + case CENTER_IMAGE_ALIGN: + break; + case SCALE_IMAGE_ALIGN: + { + double scale_x = (double) gdk_pixbuf_get_width (pixbuf) / width; + double scale_y = (double) gdk_pixbuf_get_height (pixbuf) / height; + cairo_matrix_t matrix; + cairo_matrix_init_scale (&matrix, scale_x, scale_y); + cairo_pattern_set_matrix (cairo_get_source (cr), &matrix); + break; + } + case TILE_IMAGE_ALIGN: + cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); + break; + } + + cairo_rectangle (cr, x, y, width, height); + cairo_fill (cr); + + cairo_destroy (cr); + if (needs_transform) + g_object_unref (G_OBJECT (pixbuf)); + return FALSE; +} + +GtkWidget* ygtk_image_new (void) +{ + return g_object_new (YGTK_TYPE_IMAGE, NULL); +} + +static void ygtk_image_class_init (YGtkImageClass *klass) +{ + GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); + widget_class->expose_event = ygtk_image_expose_event; + widget_class->size_request = ygtk_image_size_request; + + GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); + gtkobject_class->destroy = ygtk_image_destroy; +} + Added: trunk/gtk/unstable/src/ygtkimage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable/src/ygtkimage.h?rev… ============================================================================== --- trunk/gtk/unstable/src/ygtkimage.h (added) +++ trunk/gtk/unstable/src/ygtkimage.h Thu Dec 6 05:28:35 2007 @@ -0,0 +1,75 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* GtkImage doesn't provide all the functionality asked by libyui, + such as scaling and tiling. Thus, YGtkImage is a more powerful + GtkImage. +*/ + +#ifndef YGTK_IMAGE_H +#define YGTK_IMAGE_H + +#include <gtk/gtkdrawingarea.h> +#include <gdk/gdkpixbuf.h> + +G_BEGIN_DECLS + +#define YGTK_TYPE_IMAGE (ygtk_image_get_type ()) +#define YGTK_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_IMAGE, YGtkImage)) +#define YGTK_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_IMAGE, YGtkImageClass)) +#define YGTK_IS_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_IMAGE)) +#define YGTK_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_IMAGE)) +#define YGTK_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_IMAGE, YGtkImageClass)) + +typedef enum { + CENTER_IMAGE_ALIGN, SCALE_IMAGE_ALIGN, TILE_IMAGE_ALIGN +} YGtkImageAlign; + +struct _YGtkImageAnimation { + GdkPixbufAnimation *pixbuf; + GdkPixbufAnimationIter *frame; + guint timeout_id; +}; + +typedef struct _YGtkImage +{ + GtkDrawingArea parent; + + // properties: + YGtkImageAlign align; + + gboolean animated; + union { + GdkPixbuf *pixbuf; + struct _YGtkImageAnimation *animation; + }; + + gboolean loaded; + gchar *alt_text; + +} YGtkImage; + +typedef struct _YGtkImageClass +{ + GtkDrawingAreaClass parent_class; +} YGtkImageClass; + +GtkWidget* ygtk_image_new (void); +GType ygtk_image_get_type (void) G_GNUC_CONST; + +void ygtk_image_set_from_file (YGtkImage *image, const char *filename, gboolean anim); +void ygtk_image_set_from_data (YGtkImage *image, const guint8 *data, long size, gboolean anim); +void ygtk_image_set_props (YGtkImage *image, YGtkImageAlign align, const gchar *alt_text); + +// as we don't have a window, + +G_END_DECLS + +#endif /* YGTK_IMAGE_H */ + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42748 - in /branches/tmp/coolo/qt4-port: ./ src/ src/pkg/
by coolo＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: coolo Date: Wed Dec 5 21:48:44 2007 New Revision: 42748 URL: http://svn.opensuse.org/viewcvs/yast?rev=42748&view=rev Log: Duncan, for you Added: branches/tmp/coolo/qt4-port/src/YQMainWinDock.cc - copied unchanged from r42747, trunk/qt/src/YQMainWinDock.cc branches/tmp/coolo/qt4-port/src/YQMainWinDock.h - copied unchanged from r42747, trunk/qt/src/YQMainWinDock.h Removed: branches/tmp/coolo/qt4-port/src/YQEBunny.cc branches/tmp/coolo/qt4-port/src/YQEBunny.h Modified: branches/tmp/coolo/qt4-port/ (props changed) branches/tmp/coolo/qt4-port/VERSION.cmake branches/tmp/coolo/qt4-port/src/CMakeLists.txt branches/tmp/coolo/qt4-port/src/YQDialog.cc branches/tmp/coolo/qt4-port/src/YQDialog.h branches/tmp/coolo/qt4-port/src/YQUI.h branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc branches/tmp/coolo/qt4-port/src/YQUI_core.cc branches/tmp/coolo/qt4-port/src/YQUI_x11.cc branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorHelp.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h Modified: branches/tmp/coolo/qt4-port/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/VERSION.cm… ============================================================================== --- branches/tmp/coolo/qt4-port/VERSION.cmake (original) +++ branches/tmp/coolo/qt4-port/VERSION.cmake Wed Dec 5 21:48:44 2007 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") Modified: branches/tmp/coolo/qt4-port/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/CMakeL… ============================================================================== --- branches/tmp/coolo/qt4-port/src/CMakeLists.txt (original) +++ branches/tmp/coolo/qt4-port/src/CMakeLists.txt Wed Dec 5 21:48:44 2007 @@ -15,7 +15,7 @@ QY2ListView.cc QY2Settings.cc Y2CCQt.cc YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc YQCheckBox.cc YQCheckBoxFrame.cc YQComboBox.cc YQDateField.cc - YQDialog.cc YQDownloadProgress.cc YQDumbTab.cc YQEBunny.cc + YQDialog.cc YQDownloadProgress.cc YQDumbTab.cc YQMainWinDock.cc YQEmpty.cc YQFrame.cc YQGenericButton.cc YQIconPool.cc YQImage.cc YQInputField.cc YQIntField.cc YQLabel.cc YQLayoutBox.cc YQLogView.cc YQMenuButton.cc YQMultiLineEdit.cc Modified: branches/tmp/coolo/qt4-port/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDial… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.cc Wed Dec 5 21:48:44 2007 @@ -22,7 +22,6 @@ #define y2log_component "qt-ui" #include <ycp/y2log.h> #include <qpushbutton.h> -#include <qframe.h> #include <qmessagebox.h> #include <QDesktopWidget> @@ -33,6 +32,7 @@ #include "YQGenericButton.h" #include "YQWizardButton.h" #include "YQWizard.h" +#include "YQMainWinDock.h" // Include low-level X headers AFTER Qt headers: // X.h pollutes the global namespace (!!!) with pretty useless #defines @@ -43,10 +43,19 @@ #define YQPopupDialogWFlags Qt::Widget -YQDialog::YQDialog( QWidget * qParent, - YDialogType dialogType, +/* FIXME +#define YQPopupDialogWFlags \ + ( Qt::WStyle_Customize | \ + Qt::WStyle_Dialog | \ + Qt::WShowModal | \ + Qt::WType_Modal | \ + Qt::WStyle_DialogBorder ) +*/ + + +YQDialog::YQDialog( YDialogType dialogType, YDialogColorMode colorMode ) - : QWidget( qParent, + : QWidget( chooseParent( dialogType ), dialogType == YMainDialog ? YQMainDialogWFlags : YQPopupDialogWFlags ) , YDialog( dialogType, colorMode ) { @@ -55,7 +64,7 @@ _defaultButton = 0; setWidgetRep( this ); - setWindowTitle( dialogType == YMainDialog ? "YaST2" : "" ); + setWindowTitle( "YaST2" ); setFocusPolicy( Qt::StrongFocus ); if ( colorMode != YDialogNormalColor ) @@ -76,15 +85,42 @@ warnPalette.setCurrentColorGroup(QPalette::Active); setPalette( warnPalette ); } + + if ( dialogType == YMainDialog && + QWidget::parent() != YQMainWinDock::mainWinDock() ) + { + setWindowFlags( YQPopupDialogWFlags ); + } } YQDialog::~YQDialog() { + if ( dialogType() == YMainDialog ) + { + YQMainWinDock::mainWinDock()->remove( (QWidget *) widgetRep() ); + } } -int YQDialog::preferredWidth() +QWidget * +YQDialog::chooseParent( YDialogType dialogType ) +{ + QWidget * parent = 0; + + if ( dialogType == YMainDialog && + YQMainWinDock::mainWinDock()->couldDock() ) + { + y2debug( "Adding dialog to mainWinDock" ); + parent = YQMainWinDock::mainWinDock(); + } + + return parent; +} + + +int +YQDialog::preferredWidth() { int preferredWidth; @@ -112,7 +148,8 @@ } -int YQDialog::preferredHeight() +int +YQDialog::preferredHeight() { int preferredHeight; @@ -140,15 +177,19 @@ } -void YQDialog::setEnabled( bool enabled ) +void +YQDialog::setEnabled( bool enabled ) { QWidget::setEnabled( enabled ); YDialog::setEnabled( enabled ); } -void YQDialog::setSize( int newWidth, int newHeight ) +void +YQDialog::setSize( int newWidth, int newHeight ) { + // y2debug( "Resizing dialog to %d x %d", newWidth, newHeight ); + if ( newWidth > qApp->desktop()->width() ) newWidth = qApp->desktop()->width(); @@ -164,19 +205,11 @@ } - -void YQDialog::activate( bool active ) +void +YQDialog::activate( bool active ) { if ( active ) { - if ( ! YQUI::ui()->haveWM() ) - { - if ( YQUI::ui()->autoActivateDialogs() ) - activateWindow(); - else - y2milestone( "Auto-activating dialog window turned off" ); - } - ensureOnlyOneDefaultButton(); } } @@ -187,9 +220,12 @@ { if ( event ) { + // y2debug( "Resize event: %d x %d", event->size().width(), event->size().height() ); setSize ( event->size().width(), event->size().height() ); - _userSize = event->size(); - _userResized = true; + _userSize = event->size(); + + if ( QWidget::parent() ) + _userResized = true; } } @@ -317,7 +353,7 @@ YDialog::setDefaultButton( _defaultButton ); } - + YQGenericButton * def = _focusButton ? _focusButton : _defaultButton; if ( def ) @@ -335,7 +371,6 @@ YQWizard * YQDialog::findWizard( YWidgetListConstIterator begin, YWidgetListConstIterator end ) const - { for ( YWidgetListConstIterator it = begin; it != end; ++it ) { @@ -427,7 +462,7 @@ _defaultButton->showAsDefault( true ); } - + YDialog::setDefaultButton( 0 ); // prevent complaints about multiple default buttons YDialog::setDefaultButton( _defaultButton ); } @@ -514,11 +549,6 @@ YQUI::ui()->makeScreenShot( "" ); return; } - else if ( event->key() == Qt::Key_F5 ) // No matter if Ctrl/Alt/Shift pressed - { - YQUI::ui()->easterEgg(); - return; - } else if ( event->key() == Qt::Key_F4 && // Shift-F4: toggle colors for vision impaired users event->modifiers() & Qt::ShiftModifier ) { @@ -592,23 +622,25 @@ } -void YQDialog::closeEvent( QCloseEvent * event ) +void +YQDialog::closeEvent( QCloseEvent * event ) { // The window manager "close window" button (and WM menu, e.g. Alt-F4) will be // handled just like the user had clicked on the `id`( `cancel ) button in // that dialog. It's up to the YCP application to handle this (if desired). - y2debug( "Ignoring window manager close button." ); + y2milestone( "Caught window manager close event - returning with YCancelEvent" ); event->ignore(); YQUI::ui()->sendEvent( new YCancelEvent() ); } -void YQDialog::focusInEvent( QFocusEvent * event ) +void +YQDialog::focusInEvent( QFocusEvent * event ) { // The dialog itself doesn't need or want the keyboard focus, but obviously - // ( since Qt 2.3? ) it needs QFocusPolicy::StrongFocus for the default + // (since Qt 2.3?) it needs QFocusPolicy::StrongFocus for the default // button mechanism to work. So let's accept the focus and give it to some // child widget. @@ -627,39 +659,11 @@ void -YQDialog::show() -{ -#if FIXME - if ( ! dialogType() == YMainDialog && qApp->mainWidget()->isVisible() ) - center( this, qApp->mainWidget() ); -#endif - - QWidget::show(); -} - - -void YQDialog::center( QWidget * dialog, QWidget * parent ) { - if ( ! dialog ) + if ( ! dialog || ! parent ) return; - if ( ! parent ) - { - //FIXME if not toplevel window - // align with top level widget - foreach (QWidget *widget, QApplication::topLevelWidgets()) - { - // if it is a top level widget, center with desktop - if (dialog == widget) parent = qApp->desktop(); break; - } - - if ( QApplication::topLevelWidgets().empty() ) - return; - - parent = QApplication::topLevelWidgets().first(); - } - QPoint pos( ( parent->width() - dialog->width() ) / 2, ( parent->height() - dialog->height() ) / 2 ); Modified: branches/tmp/coolo/qt4-port/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQDial… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQDialog.h (original) +++ branches/tmp/coolo/qt4-port/src/YQDialog.h Wed Dec 5 21:48:44 2007 @@ -43,8 +43,7 @@ * colors or YDialogInfoColor to use more prominent, yet not quite as * bright as "warning" colors. Use both only very rarely. **/ - YQDialog( QWidget * qParent, - YDialogType dialogType, + YQDialog( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); protected: @@ -101,7 +100,7 @@ YQGenericButton * findDefaultButton(); /** - * Returns whether or not the user has resized this dialog. + * Return 'true' if the user resized this dialog. **/ bool userResized() { return _userResized; } @@ -176,6 +175,13 @@ protected: /** + * Choose a parent widget for a dialog of the specified type: + * Either the main window dock (if this is a YMainDialog and the dock + * currently accepts child dialogs) or 0. + **/ + static QWidget * chooseParent( YDialogType dialogType ); + + /** * Return the (first) default button between 'begin' and 'end' * or 0 if there is none. **/ @@ -199,44 +205,24 @@ YWidgetListConstIterator end ); /** - * Event handler for keyboard input. - * Only very special keys are processed here. - * - * Inherited from QWidget. - **/ - void keyPressEvent( QKeyEvent * e ); - - - /** - * Event handler for focusIn event. + * Qt event handlers. * - * Inherited from QWidget. - **/ - void focusInEvent( QFocusEvent * event ); - - /** - * Event handler for window resize. - * - * Inherited from QWidget. - **/ - void resizeEvent ( QResizeEvent * ev ); - - - /** - * Inherited from QWidget: Called when the dialog is shown. + * All reimplemented from QWidget. **/ - void show(); + virtual void keyPressEvent ( QKeyEvent * event ); + virtual void focusInEvent ( QFocusEvent * event ); + virtual void resizeEvent ( QResizeEvent * event ); // // Data members // - bool _userResized; - QSize _userSize; + bool _userResized; + QSize _userSize; - YQGenericButton * _focusButton; - YQGenericButton * _defaultButton; + YQGenericButton * _focusButton; + YQGenericButton * _defaultButton; }; Modified: branches/tmp/coolo/qt4-port/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI.h… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI.h (original) +++ branches/tmp/coolo/qt4-port/src/YQUI.h Wed Dec 5 21:48:44 2007 @@ -133,23 +133,15 @@ YEvent * pendingEvent() const { return _event_handler.pendingEvent(); } /** - * Returns 'false" if the "--no-wm" was specified on the command line, i.e. - * we should assume no window manager is running. - **/ - bool haveWM() const { return _have_wm; } - - /** - * Returns 'true' if defaultsize windows should use the full screen. + * Return 'true' if defaultsize windows should use the full screen. **/ bool fullscreen() const { return _fullscreen; } /** - * Returns 'false' if toplevel (defaultsize) windows should not get window - * manager decorations, i.e. "--noborder" was specified on the command - * line. + * Return 'true' if defaultsize windows should not get window manager + * borders / frames. **/ - bool decorateToplevelWindow() const { return _decorate_toplevel_window; } - + bool noBorder() const { return _noborder; } /** * Returns 'true' if the UI had a fatal error that requires the application * to abort. @@ -203,28 +195,6 @@ **/ void internalError( const char * msg ); - - /** - * Block WM_CLOSE events for the main window. - **/ - void blockWmClose() { _wm_close_blocked = true; } - - /** - * Unblock WM_CLOSE events for the main window. - **/ - void unblockWmClose() { _wm_close_blocked = false; } - - /** - * Check if dialogs are to be activated automatically - **/ - bool autoActivateDialogs() const { return _auto_activate_dialogs; } - - /** - * Change automatic dialog activation - **/ - void setAutoActivateDialogs( bool activate ) - { _auto_activate_dialogs = activate; } - /** * Block (or unblock) events. If events are blocked, any event sent * should be ignored until events are unblocked again. @@ -284,11 +254,6 @@ void askConfigureLogging(); /** - * Fun stuff (release dependent) - **/ - void easterEgg(); - - /** * A mouse click with the wrong mouse button was detected - e.g., a right * click on a push button. The user might be left-handed, but his mouse * might not (yet) be configured for left-handed use - e.g., during @@ -300,13 +265,6 @@ void maybeLeftHandedUser(); -signals: - /** - * Emitted upon WM_CLOSE - **/ - void wmClose(); - - protected: /** @@ -353,21 +311,6 @@ **/ void closeDialog( YDialog * dialog ); - /** - * Grab show events and work around QWidgetStack bug. - * - * Reimplemented from QObject. - **/ - bool eventFilter( QObject * obj, QEvent * ev ); - - /** - * Make all UI windows usable without a mouse - even predefined Qt dialogs - * that don't know the UI's dialogs' activate() magic. - * - * Reimplemented from QObject. - **/ - bool showEventFilter( QObject * obj, QEvent * ev ); - public: @@ -433,11 +376,6 @@ const QString & headline ); /** - * main widget - **/ - QWidget* mainWidget(); - - /** * Initialize and set a textdomain for gettext() **/ static void setTextdomain( const char * domain ); @@ -545,19 +483,14 @@ // /** - * Assume presence of a window manager - **/ - bool _have_wm; - - /** * Use the entire available screen **/ bool _fullscreen; /** - * Decorate the toplevel window + * No window border for the main window **/ - bool _decorate_toplevel_window; + bool _noborder; /** * Container for the widget stack. QWidgetStack cannot handle a WFlags @@ -567,16 +500,6 @@ QWidget * _main_win; /** - * Stack for the Qt widgets inside the main window. - **/ - QStackedWidget * _widget_stack; - - /** - * Stack to keep track of the stacking order of popup dialogs. - **/ - vector<QWidget *> _popup_stack; - - /** * Size for `opt(`defaultsize) dialogs. **/ QSize _default_size; @@ -594,18 +517,7 @@ **/ QEventLoop * _eventLoop; - /** - * Window manager close events blocked? - **/ - bool _wm_close_blocked; - - /** - * Force new dialogs to the foreground and grab the keyboard focus? - * (Only if running without a window manager) - **/ - bool _auto_activate_dialogs; - - /** + /* * Global reference to the UI **/ static YQUI * _ui; Modified: branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_b… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_builtins.cc Wed Dec 5 21:48:44 2007 @@ -78,9 +78,6 @@ YCPValue YQUI::runPkgSelection( YWidget * packageSelector ) { y2milestone( "Running package selection..." ); - _wm_close_blocked = true; - _auto_activate_dialogs = false; - YCPValue input = YCPVoid(); try @@ -98,8 +95,6 @@ y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); } - _auto_activate_dialogs = true; - _wm_close_blocked = false; y2milestone( "Package selection done - returning %s", input->toString().c_str() ); return input; Modified: branches/tmp/coolo/qt4-port/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_c… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_core.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_core.cc Wed Dec 5 21:48:44 2007 @@ -41,7 +41,6 @@ #include "YQOptionalWidgetFactory.h" #include "YEvent.h" #include "YUISymbols.h" -#include "YQEBunny.h" #include "utf8.h" #include "YQDialog.h" @@ -57,17 +56,14 @@ : QObject() , YUI( with_threads ) , _main_win( NULL ) + , _do_exit_loop( false ) , _eventLoop( 0 ) - , _wm_close_blocked( false ) - , _auto_activate_dialogs( true ) { y2milestone( "YQUI constructor start" ); _ui = this; _fatal_error = false; - _have_wm = true; _fullscreen = false; - _decorate_toplevel_window = true; _usingVisionImpairedPalette = false; _leftHandedMouse = false; _askedForLeftHandedMouse = false; @@ -115,7 +111,6 @@ // Qt keeps track to a global QApplication in qApp. Q_CHECK_PTR( qApp ); - qApp->installEventFilter( this ); processCommandLineArgs( _ui_argc, _ui_argv ); calcDefaultSize(); @@ -132,34 +127,14 @@ // We have to use something else than QWidgetStack since QWidgetStack // doesn't accept a WFlags arg which we badly need here. - Qt::WFlags wflags = Qt::Window; - - if ( ! _decorate_toplevel_window ) - { - y2debug( "Suppressing WM decorations for toplevel window" ); - wflags |= Qt::FramelessWindowHint; - } - - _main_win = new QWidget( 0, wflags ); // parent, wflags + _main_win = new QWidget( 0, Qt::Window ); // parent, wflags _main_win->setFocusPolicy( Qt::StrongFocus ); _main_win->setObjectName( "main_window" ); _styler->registerWidget( _main_win ); - // Create widget stack for `opt(`defaultsize) dialogs - QVBoxLayout *vbox = new QVBoxLayout( _main_win ); - vbox->setSpacing( 0 ); - vbox->setMargin( 0 ); - - _widget_stack = new QStackedWidget( _main_win ); - _widget_stack->setFocusPolicy( Qt::StrongFocus ); - vbox->addWidget( _widget_stack ); -#if 0 - _main_win->installEventFilter( this ); -#endif - _main_win->resize( _default_size ); - if ( _fullscreen || ! _have_wm ) + if ( _fullscreen ) _main_win->move( 0, 0 ); @@ -258,9 +233,8 @@ if ( opt.startsWith( "--" ) ) opt.remove(0, 1); - if ( opt == QString( "-no-wm" ) ) _have_wm = false; - else if ( opt == QString( "-fullscreen" ) ) _fullscreen = true; - else if ( opt == QString( "-noborder" ) ) _decorate_toplevel_window = false; + if ( opt == QString( "-fullscreen" ) ) _fullscreen = true; + else if ( opt == QString( "-noborder" ) ) _noborder = true; else if ( opt == QString( "-auto-font" ) ) yqApp()->setAutoFonts( true ); else if ( opt == QString( "-auto-fonts" ) ) yqApp()->setAutoFonts( true ); // --macro is handled by YUI_component @@ -270,7 +244,6 @@ "Command line options for the YaST2 Qt UI:\n" "\n" "--nothreads run without additional UI threads\n" - "--no-wm assume no window manager is running\n" "--fullscreen use full screen for `opt(`defaultsize) dialogs\n" "--noborder no window manager border for `opt(`defaultsize) dialogs\n" "--auto-fonts automatically pick fonts, disregard Qt standard settings\n" @@ -348,7 +321,7 @@ y2milestone( "-fullscreen: using %dx%d for `opt(`defaultsize)", _default_size.width(), _default_size.height() ); } - else if ( _have_wm ) + else { // Get _default_size via -geometry command line option (if set) @@ -358,7 +331,6 @@ // qApp->setMainWidget( dummy ); // _default_size = dummy->size(); - // Set min defaultsize or figure one out if -geometry was not used if ( _default_size.width() < 800 || @@ -382,11 +354,6 @@ _default_size.width(), _default_size.height() ); } } - else // ! _have_wm - { - _default_size = primaryScreenSize; - } - y2milestone( "Default size: %dx%d", _default_size.width(), _default_size.height() ); } @@ -465,8 +432,6 @@ if ( timeout_millisec > 0 ) _user_input_timer.start( timeout_millisec ); // single shot - dialog->activate( true ); - if ( qApp->focusWidget() ) qApp->focusWidget()->setFocus(); @@ -476,7 +441,6 @@ _do_exit_loop = false; event = _event_handler.consumePendingEvent(); - dialog->activate( false ); // Display a busy cursor, but only if there is no other activity within // BUSY_CURSOR_TIMEOUT milliseconds (avoid cursor flicker) @@ -504,10 +468,8 @@ if ( dialog ) { - dialog->activate( true ); //qApp->processEvents(); event = _event_handler.consumePendingEvent(); - dialog->activate( false ); } } @@ -525,62 +487,16 @@ } -#warning obsolete -#if 0 -YDialog * YQUI::createDialog( YWidgetOpt & opt ) -{ - init_ui(); - - y2milestone( "createDialog %ld", QThread::currentThreadId () ); - bool has_defaultsize = opt.hasDefaultSize.value(); - QWidget * qt_parent = - has_defaultsize ? _widget_stack : _main_win; - - // FIXME: Probably obsolete - if ( ! has_defaultsize && ! _popup_stack.empty() ) - qt_parent = _popup_stack.back(); - - YQDialog * dialog = new YQDialog( opt, qt_parent, has_defaultsize ); - Q_CHECK_PTR( dialog ); - - if ( ! has_defaultsize ) - _popup_stack.push_back( (QWidget *) dialog->widgetRep() ); - - return dialog; -} -#endif - - +#warning FIXME Move this to Y(Q)Dialog (and rename it to ::finalize()?) void YQUI::showDialog( YDialog * dialog ) { QWidget * qw = (QWidget *) dialog->widgetRep(); - - if ( ! qw ) - { - y2error( "No widgetRep() for dialog" ); - return; - } - - if ( dialog->dialogType() == YMainDialog ) - { - _widget_stack->addWidget ( qw ); - _widget_stack->setCurrentWidget( qw ); - - if ( ! _main_win->isVisible() ) - { - // y2milestone( "Showing main window" ); - _main_win->resize( _default_size ); - - if ( ! _have_wm ) - _main_win->move( 0, 0 ); - - _main_win->show(); - qw->setFocus(); - } - } - else // non-defaultsize dialog + + if ( qw ) { qw->show(); + qw->raise(); + qw->update(); } ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton(); @@ -591,49 +507,6 @@ void YQUI::closeDialog( YDialog * dialog ) { - QWidget * qw = (QWidget *) dialog->widgetRep(); - - if ( ! qw ) - { - y2error( "No widgetRep() for dialog" ); - return; - } - - if ( dialog->dialogType() == YMainDialog ) - { - _widget_stack->removeWidget( qw ); - } - else // non-defaultsize dialog - { - qw->hide(); - -#warning FIXME -#if 0 - // Clean up the popup stack. libyui guarantees that a dialog will be - // deleted after closeDialog() so it is safe to pop that dialog from - // the popup stack here. - - if ( ! _popup_stack.empty() && _popup_stack.back() == qw ) - _popup_stack.pop_back(); - else - y2error( "Popup dialog stack corrupted!" ); -#endif - } -} - - -void YQUI::easterEgg() -{ - y2milestone( "Starting easter egg..." ); - - - YQEasterBunny::layEgg(); - y2milestone( "Done." ); - -#if 0 - // desktop()->repaint() has no effect - we need to do it the hard way. - system( "/usr/X11R6/bin/xrefresh" ); -#endif } Modified: branches/tmp/coolo/qt4-port/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQUI_x… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQUI_x11.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQUI_x11.cc Wed Dec 5 21:48:44 2007 @@ -82,19 +82,10 @@ int YQUI::defaultSize(YUIDimension dim) const { - if ( haveWM() ) - return dim == YD_HORIZ ? _default_size.width() : _default_size.height(); - else - return dim == YD_HORIZ ? qApp->desktop()->width() : qApp->desktop()->height(); + return dim == YD_HORIZ ? _default_size.width() : _default_size.height(); } -QWidget* YQUI::mainWidget() -{ - return _main_win; -}; - - void YQUI::beep() { qApp->beep(); @@ -178,82 +169,6 @@ } -bool YQUI::eventFilter( QObject * obj, QEvent * ev ) -{ - if ( ev->type() == QEvent::Close ) - { - // Handle WM_CLOSE - but only if it comes from a dialog that is managed by the UI, - // not from an independent Qt dialog (such as the package selector popups) - - QWidget * objDialog = 0; - - if ( obj && obj->isWidgetType() ) - { - objDialog = (QWidget *) obj; - objDialog = objDialog->topLevelWidget(); - } - - if ( objDialog && - ( objDialog == mainWidget() || - objDialog == (QObject *) YDialog::currentDialog()->widgetRep() ) ) - { - emit wmClose(); - - if ( ! _wm_close_blocked ) - { - // Don't simply close the application window, return from UserInput() - // with `id(`cancel) and let the YCP application decide how to handle - // that (e.g., ask for confirmation). - - y2debug( "Caught window close event - returning with `cancel" ); - sendEvent( new YCancelEvent() ); - } - - return true; // Event processed - } - } - else if ( ev->type() == QEvent::Show ) - { - if ( obj == _main_win ) - { -#ifdef FIXME_PROBABLY_OBSOLETE - if ( _widget_stack->count() > 0 ) - { - // Work around QWidgetStack bug: The last raiseWidget() call - // (from closeDialog() ) might have failed if the widget was - // invisible at that time, e.g., because the user had switched to - // some other virtual desktop (bugzilla bug #11310) - - _widget_stack->setCurrentWidget( whatever ); - } -#endif - } - else - { - return showEventFilter( obj, ev ); - } - } - return QObject::eventFilter( obj, ev ); -} - - -bool YQUI::showEventFilter( QObject * obj, QEvent * ev ) -{ - if ( ! haveWM() ) - { - // Make sure newly opened windows get the keyboard focus even without a - // window manager. Otherwise the app might be unusable without a mouse. - - QWidget * widget = dynamic_cast<QWidget *> (obj); - - if ( widget ) - widget->activateWindow(); - } - - return false; // Don't stop event processing -} - - /** * UI-specific conversion from logical layout spacing units (80x25) * to device dependent units (640x480). Modified: branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQWidg… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQWidgetFactory.cc Wed Dec 5 21:48:44 2007 @@ -17,10 +17,14 @@ /-*/ #include <QColorGroup> +#define y2log_component "qt-ui" +#include <ycp/y2log.h> + #include "YQWidgetFactory.h" #include "YQUI.h" #include "YUIException.h" #include "YQPackageSelectorPlugin.h" +#include "YQMainWinDock.h" #include <string> @@ -47,8 +51,7 @@ YQDialog * YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) { - QWidget * qParent = 0; - YQDialog * dialog = new YQDialog( qParent, dialogType, colorMode ); + YQDialog * dialog = new YQDialog( dialogType, colorMode ); YUI_CHECK_NEW( dialog ); return dialog; @@ -279,8 +282,6 @@ YQPackageSelector * YQWidgetFactory::createPackageSelector( YWidget * parent, long modeFlags ) { - YQUI::ui()->setAutoActivateDialogs( false ); - YQPackageSelectorPlugin * plugin = YQUI::ui()->packageSelectorPlugin(); if ( plugin ) Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.cc Wed Dec 5 21:48:44 2007 @@ -66,7 +66,6 @@ YQUI::setTextdomain( "packages-qt" ); setFont( YQUI::yqApp()->currentFont() ); - YQUI::ui()->blockWmClose(); // Automatically undone after UI::RunPkgSelection() _pkgConflictDialog = new YQPkgConflictDialog( this ); Q_CHECK_PTR( _pkgConflictDialog ); @@ -87,12 +86,8 @@ zyppPool().saveState<zypp::Patch >(); - // - // Handle WM_CLOSE like "Cancel" - // - - connect( YQUI::ui(), SIGNAL( wmClose() ), - this, SLOT ( reject() ) ); + // Install event handler to handle WM_CLOSE like "Cancel" + topLevelWidget()->installEventFilter( this ); y2milestone( "PackageSelectorBase init done" ); } @@ -390,17 +385,26 @@ return; } } - else if ( event->key() == Qt::Key_F5 ) // No matter if Ctrl/Alt/Shift pressed - { - YQUI::ui()->easterEgg(); - return; - } } QWidget::keyPressEvent( event ); } +bool YQPackageSelectorBase::eventFilter( QObject * obj, QEvent * event ) +{ + if ( event->type() == QEvent::Close ) + { + // Handle WM_CLOSE like "Cancel" + reject(); + + return true; // Stop processing this event + } + + return false; // Don't stop processing this event +} + + int YQPackageSelectorBase::preferredWidth() { return max( 640, sizeHint().width() ); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorBase.h Wed Dec 5 21:48:44 2007 @@ -91,7 +91,14 @@ **/ virtual bool setKeyboardFocus(); + /** + * Event filter to handle WM_CLOSE like "Cancel" + * + * Reimplemented from QObject. + **/ + virtual bool eventFilter( QObject * obj, QEvent * event ); + public slots: /** Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorHelp.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorHelp.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPackageSelectorHelp.cc Wed Dec 5 21:48:44 2007 @@ -139,38 +139,38 @@ html += "<table border=1>"; html += symHelp( "noinst.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Do not install" ), // Translators: Automatic word-wrapping. _( "This package is not installed and it will not be installed." ) ); html += symHelp( "install.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Install" ), // Translators: Automatic word-wrapping. _( "This package will be installed. It is not installed yet." ) ); html += symHelp( "keepinstalled.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Keep" ), // Translators: Automatic word-wrapping. _( "This package is already installed. Leave it untouched." ) ); html += symHelp( "update.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Update" ), // Translators: Automatic word-wrapping. _( "This package is already installed. Update it or reinstall it" " (if the versions are the same)." ) ); html += symHelp( "del.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Delete" ), // Translators: Automatic word-wrapping. _( "This package is already installed. Delete it." ) ); html += symHelp( "taboo.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Taboo" ), // Translators: Automatic word-wrapping. _( "This package is not installed and should not be installed under any circumstances, " @@ -180,7 +180,7 @@ + _( "Packages set to \"taboo\" are treated as if they did not exist on any installation media." ) ); html += symHelp( "protected.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Protected" ), // Translators: Automatic word-wrapping. _( "This package is installed and should not be modified, " @@ -191,7 +191,7 @@ " that may come with the distribution." ) ); html += symHelp( "autoinstall.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autoinstall" ), // Translators: Automatic word-wrapping. _( "This package will be installed automatically because some other package needs it." ) @@ -199,14 +199,14 @@ + _( "<b>Hint:</b> You may have to use \"taboo\" to get rid of such a package." ) ); html += symHelp( "autoupdate.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autoupdate" ), // Translators: Automatic word-wrapping. _( "This package is already installed, but some other package" " needs a newer version, so it will automatically be updated." ) ); html += symHelp( "autodel.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autodelete" ), // Translators: Automatic word-wrapping. _( "This package is already installed, but package dependencies require that it is deleted." ) @@ -218,14 +218,14 @@ QString bySelection = " " + _( "(by selection)" ); html += symHelp( "sel_autoinstall.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autoinstall" ) + bySelection, // Translators: Automatic word-wrapping. _( "This package will be installed automatically because it is contained in a" " predefined software selection (e.g., \"Multimedia\", \"Development\")." ) ); html += symHelp( "sel_autoupdate.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autoupdate" ) + bySelection, // Translators: Automatic word-wrapping. _( "This package is already installed, but there is a newer version." @@ -234,7 +234,7 @@ " automatically be updated." ) ); html += symHelp( "sel_autodel.xpm", - // Translators: Package status short ( ! ) description + // Translators: Package status short (!) description _( "Autodelete" ) + bySelection, // Translators: Automatic word-wrapping. _( "This package is already installed, but some predefined software selection" @@ -276,7 +276,7 @@ html += "<table border=1>"; html += keyHelp( "+", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Add" ), // Translators: Automatic word-wrapping. _( "Get this package. Install it if it is not installed yet." @@ -285,7 +285,7 @@ + goto_next ); html += keyHelp( "-", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Remove" ), // Translators: Automatic word-wrapping. _( "Get rid of this package. Mark it as \"do not install\" " @@ -293,7 +293,7 @@ + goto_next ); html += keyHelp( ">", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Update" ), // Translators: Automatic word-wrapping. _( "Update this package if it is installed and there is a newer version." @@ -302,7 +302,7 @@ html += keyHelp( "<", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Undo Update" ), // Translators: Automatic word-wrapping. _( "Undo the effect of \">\" above: Set package to \"keep\"" @@ -310,7 +310,7 @@ + goto_next ); html += keyHelp( "!", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Taboo" ), // Translators: Automatic word-wrapping. _( "Set this package to \"taboo\" if it is not installed:" @@ -322,7 +322,7 @@ + goto_next ); html += keyHelp( "*", - // Translators: Keyboard action short ( ! ) description + // Translators: Keyboard action short (!) description _( "Protect" ), // Translators: Automatic word-wrapping. _( "Set this package to \"protected\" if it is installed:" Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictDialog.cc Wed Dec 5 21:48:44 2007 @@ -148,7 +148,7 @@ _busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0 #ifdef FIXME - , WType_Dialog + , WStyle_Customize | WStyle_DialogBorder | WStyle_Dialog | WStyle_Title #endif ); Q_CHECK_PTR( _busyPopup ); Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.cc Wed Dec 5 21:48:44 2007 @@ -352,7 +352,10 @@ while ( it != solutions.end() ) { - new YQPkgConflictResolution( _resolutionsHeader, *it ); + YQPkgConflictResolution * solution = new YQPkgConflictResolution( _resolutionsHeader, *it ); + Q_CHECK_PTR( solution ); + //FIXME solution->setOpen(true); + ++it; } } Modified: branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/pkg/YQ… ============================================================================== --- branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h (original) +++ branches/tmp/coolo/qt4-port/src/pkg/YQPkgConflictList.h Wed Dec 5 21:48:44 2007 @@ -111,7 +111,7 @@ static void dumpList( QTreeWidgetItem * parent, const QString & longText, const QString & header = QString::null, - int splitThreshold = 5 ); + int splitThreshold = 3 ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42747 - /branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update
by jdsn＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jdsn Date: Wed Dec 5 21:08:39 2007 New Revision: 42747 URL: http://svn.opensuse.org/viewcvs/yast?rev=42747&view=rev Log: (empty) Modified: branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update Modified: branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/empty/keep_it_empty_… ============================================================================== --- branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update (original) +++ branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update Wed Dec 5 21:08:39 2007 @@ -2,6 +2,6 @@ ------------------------------------------------------------ Please just keep this thingy here and do not change it. - I just need a dummy svn directory to test something. + I just need a dummy SVN directory to test something. For questions please contact jdsn(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42746 - in /branches/tmp/jdsn/empty: ./ keep_it_empty_and_do_not_update
by jdsn＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: jdsn Date: Wed Dec 5 20:53:02 2007 New Revision: 42746 URL: http://svn.opensuse.org/viewcvs/yast?rev=42746&view=rev Log: just empty, need a dummy svn directory, please keep and dont change it Added: branches/tmp/jdsn/empty/ branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update Added: branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/empty/keep_it_empty_… ============================================================================== --- branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update (added) +++ branches/tmp/jdsn/empty/keep_it_empty_and_do_not_update Wed Dec 5 20:53:02 2007 @@ -0,0 +1,7 @@ +There absolutely nothing interesting in here! +------------------------------------------------------------ + + Please just keep this thingy here and do not change it. + I just need a dummy svn directory to test something. + + For questions please contact jdsn(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42745 - /tags/stable-2_16_7/qt/
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 20:45:05 2007 New Revision: 42745 URL: http://svn.opensuse.org/viewcvs/yast?rev=42745&view=rev Log: Created tag stable-2_16_7 for qt Added: tags/stable-2_16_7/qt/ - copied from r42744, trunk/qt/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42744 - in /trunk/qt: VERSION package/yast2-qt.changes
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 20:43:36 2007 New Revision: 42744 URL: http://svn.opensuse.org/viewcvs/yast?rev=42744&view=rev Log: change log Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=42744&r1=42743&r2… ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Wed Dec 5 20:43:36 2007 @@ -1 +1 @@ -2.16.6 +2.16.7 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Dec 5 20:43:36 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Dec 5 20:41:15 CET 2007 - sh(a)suse.de + +- Moved main dialog handling out of YQUI and into a new class + YQMainWinDock +- Don't proactively grab keyboard focus any longer (bug #246934) +- V 2.16.7 + +------------------------------------------------------------------- Wed Dec 5 11:13:05 CET 2007 - tgoettlicher(a)suse.de - Changed conflict dialog to better fit to sat solver's output -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42743 - in /trunk/qt/src: YQMainWinDock.cc YQUI.h YQUI_core.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 20:40:33 2007 New Revision: 42743 URL: http://svn.opensuse.org/viewcvs/yast?rev=42743&view=rev Log: support --noborder Modified: trunk/qt/src/YQMainWinDock.cc trunk/qt/src/YQUI.h trunk/qt/src/YQUI_core.cc Modified: trunk/qt/src/YQMainWinDock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQMainWinDock.cc?rev=4274… ============================================================================== --- trunk/qt/src/YQMainWinDock.cc (original) +++ trunk/qt/src/YQMainWinDock.cc Wed Dec 5 20:40:33 2007 @@ -41,10 +41,13 @@ YQMainWinDock::YQMainWinDock() - : QWidget( 0, 0, Qt::WType_TopLevel ) // parent, name, WFlags + : QWidget( 0, 0, // parent, name + YQUI::ui()->noBorder() ? + Qt::WStyle_Customize | Qt::WStyle_NoBorder : + Qt::WType_TopLevel ) { setCaption( "YaST2" ); - + setFocusPolicy( QWidget::StrongFocus ); resize( YQUI::ui()->defaultSize( YD_HORIZ ), Modified: trunk/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.h?rev=42743&r1=42742… ============================================================================== --- trunk/qt/src/YQUI.h (original) +++ trunk/qt/src/YQUI.h Wed Dec 5 20:40:33 2007 @@ -131,11 +131,16 @@ YEvent * pendingEvent() const { return _event_handler.pendingEvent(); } /** - * Returns 'true' if defaultsize windows should use the full screen. + * Return 'true' if defaultsize windows should use the full screen. **/ bool fullscreen() const { return _fullscreen; } /** + * Return 'true' if defaultsize windows should not get window manager + * borders / frames. + **/ + bool noBorder() const { return _noborder; } + /** * Returns 'true' if the UI had a fatal error that requires the application * to abort. **/ @@ -489,6 +494,11 @@ bool _fullscreen; /** + * No window border for the main window + **/ + bool _noborder; + + /** * Container for the widget stack. QWidgetStack cannot handle a WFlags * argument, so this needs to be embedded into something else - and a QVBox * at least handles all the sizeHint and resize stuff. Modified: trunk/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_core.cc?rev=42743&r1… ============================================================================== --- trunk/qt/src/YQUI_core.cc (original) +++ trunk/qt/src/YQUI_core.cc Wed Dec 5 20:40:33 2007 @@ -203,7 +203,8 @@ if ( opt.startsWith( "--" ) ) opt.remove(0, 1); - if ( opt == QString( "-fullscreen" ) ) _fullscreen = true; + if ( opt == QString( "-fullscreen" ) ) _fullscreen = true; + else if ( opt == QString( "-noborder" ) ) _noborder = true; else if ( opt == QString( "-auto-font" ) ) yqApp()->setAutoFonts( true ); else if ( opt == QString( "-auto-fonts" ) ) yqApp()->setAutoFonts( true ); // --macro is handled by YUI_component -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42742 - /trunk/yast2/scripts/yast2
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 20:27:54 2007 New Revision: 42742 URL: http://svn.opensuse.org/viewcvs/yast?rev=42742&view=rev Log: reverted last change - not obsolete at all Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=42742&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Wed Dec 5 20:27:54 2007 @@ -55,6 +55,7 @@ # Accumulated arguments for both the Qt UI and y2cc; currently supported: # --fullscreen +# --noborder # well also for gtk and ncurses Y2QT_ARGS="" GNOME_SHELL="$ybindir/y2controlcenter-gnome" @@ -68,6 +69,7 @@ echo " -h, --help this message" echo " -l, --list list all available modules" echo " -g, --geometry default window size (qt only)" + echo " --noborder no window manager border for main window" echo " --fullscreen use full screen" echo echo "exceptional case for installing packages:" @@ -167,7 +169,7 @@ fi } -TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen \ +TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen,noborder \ -n 'yast2' -- "$@"` if [ $? != 0 ] ; then echo "Exit." >&2 ; exit 1 ; fi @@ -184,6 +186,7 @@ --update) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--update; shift ;; --remove) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--remove; shift ;; --fullscreen) Y2QT_ARGS="$Y2QT_ARGS --fullscreen"; shift ;; + --noborder) Y2QT_ARGS="$Y2QT_ARGS --noborder" ; shift ;; --kcontrol) Y2QT_ARGS="$Y2QT_ARGS --kcontrol_id YaST" ; shift ;; --) shift ; break ;; *) echo "Unrecognized option $1" ; exit 1 ;; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42741 - /trunk/qt/src/YQDialog.cc
by sh-sh-sh＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: sh-sh-sh Date: Wed Dec 5 20:23:15 2007 New Revision: 42741 URL: http://svn.opensuse.org/viewcvs/yast?rev=42741&view=rev Log: wflags fine tuning Modified: trunk/qt/src/YQDialog.cc Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=42741&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Wed Dec 5 20:23:15 2007 @@ -46,10 +46,12 @@ ( Qt::WStyle_Customize | \ Qt::WStyle_Dialog | \ Qt::WShowModal | \ - WStyle_Title | \ + Qt::WType_Modal | \ Qt::WStyle_DialogBorder ) + + YQDialog::YQDialog( YDialogType dialogType, YDialogColorMode colorMode ) : QWidget( chooseParent( dialogType ), @@ -62,7 +64,7 @@ _defaultButton = 0; setWidgetRep( this ); - setCaption( dialogType == YMainDialog ? "YaST2*" : "" ); + setCaption( "YaST2" ); setFocusPolicy( QWidget::StrongFocus ); if ( colorMode != YDialogNormalColor ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r42740 - in /branches/tmp/coolo/qt4-port/src: YQBarGraph.cc YQBarGraph.h
by coolo＠svn.opensuse.org 05 Dec '07

05 Dec '07

Author: coolo Date: Wed Dec 5 20:20:27 2007 New Revision: 42740 URL: http://svn.opensuse.org/viewcvs/yast?rev=42740&view=rev Log: drawContent is no more Modified: branches/tmp/coolo/qt4-port/src/YQBarGraph.cc branches/tmp/coolo/qt4-port/src/YQBarGraph.h Modified: branches/tmp/coolo/qt4-port/src/YQBarGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQBarG… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQBarGraph.cc (original) +++ branches/tmp/coolo/qt4-port/src/YQBarGraph.cc Wed Dec 5 20:20:27 2007 @@ -59,8 +59,12 @@ void -YQBarGraph::drawContents( QPainter * painter ) +YQBarGraph::paintEvent( QPaintEvent* paintEvent ) { + QFrame::paintEvent( paintEvent ); + + QPainter painter( this ); + unsigned nextDefaultColor = 0; int totalWidth = contentsRect().width() - 2*YQBarGraphOuterMargin; int segHeight = contentsRect().height() - 2*YQBarGraphOuterMargin; @@ -104,19 +108,19 @@ textColor = defaultTextColor ( nextDefaultColor++ ); } - painter->setBrush( QColor( segmentColor.red(), + painter.setBrush( QColor( segmentColor.red(), segmentColor.green(), segmentColor.blue() ) ); - painter->setPen( Qt::NoPen ); - painter->drawRect( x_off, y_off, segWidth+2, segHeight+2 ); + painter.setPen( Qt::NoPen ); + painter.drawRect( x_off, y_off, segWidth+2, segHeight+2 ); // // Draw the label // - painter->setPen( Qt::SolidLine ); - painter->setPen( QColor( textColor.red(), + painter.setPen( Qt::SolidLine ); + painter.setPen( QColor( textColor.red(), textColor.green(), textColor.blue() ) ); @@ -125,7 +129,7 @@ if ( txt.contains( "%1" ) ) txt = txt.arg( seg.value() ); // substitute variable - painter->drawText( x_off + YQBarGraphLabelHorizontalMargin, + painter.drawText( x_off + YQBarGraphLabelHorizontalMargin, y_off + YQBarGraphLabelVerticalMargin, segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1, segHeight - 2 * YQBarGraphLabelVerticalMargin + 1, Modified: branches/tmp/coolo/qt4-port/src/YQBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/qt4-port/src/YQBarG… ============================================================================== --- branches/tmp/coolo/qt4-port/src/YQBarGraph.h (original) +++ branches/tmp/coolo/qt4-port/src/YQBarGraph.h Wed Dec 5 20:20:27 2007 @@ -85,7 +85,7 @@ * * Reimplemented from QFrame. **/ - virtual void drawContents( QPainter * painter ); + virtual void paintEvent( QPaintEvent * painter ); /** * Return one from a set of default segment background colors. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0