Hello community,
here is the log from the commit of package yast2-qt
checked in at Wed Aug 6 02:01:00 CEST 2008.
--------
--- yast2-qt/yast2-qt.changes 2008-07-16 14:35:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-08-05 11:15:48.000000000 +0200
@@ -1,0 +2,16 @@
+Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher@suse.de
+
+- V 2.18.5
+
+-------------------------------------------------------------------
+Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher@suse.de
+
+- Fixed bnc #409612: popup menu during installation becomes
+ hidden because of NULL parent
+
+-------------------------------------------------------------------
+Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher@suse.de
+
+- Fixed sorting in Table (bnc #399206)
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.17.4.tar.bz2
New:
----
yast2-qt-2.17.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.g27254/_old 2008-08-06 02:00:52.000000000 +0200
+++ /var/tmp/diff_new_pack.g27254/_new 2008-08-06 02:00:52.000000000 +0200
@@ -1,22 +1,29 @@
#
-# spec file for package yast2-qt (Version 2.17.4)
+# spec file for package yast2-qt (Version 2.17.5)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: yast2-qt
-Version: 2.17.4
+Version: 2.17.5
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.17.4.tar.bz2
+Source0: yast2-qt-2.17.5.tar.bz2
BuildRequires: docbook-xsl-stylesheets
BuildRequires: doxygen
BuildRequires: libdrm-devel
@@ -112,6 +119,13 @@
%_includedir/*
%changelog
+* Tue Aug 05 2008 tgoettlicher@suse.de
+- V 2.18.5
+* Tue Aug 05 2008 tgoettlicher@suse.de
+- Fixed bnc #409612: popup menu during installation becomes
+ hidden because of NULL parent
+* Tue Jul 29 2008 tgoettlicher@suse.de
+- Fixed sorting in Table (bnc #399206)
* Tue Jul 15 2008 sh@suse.de
- Implemented fate #303492: Multi selection for table widget
- V 2.17.4
++++++ yast2-qt-2.17.4.tar.bz2 -> yast2-qt-2.17.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/package/yast2-qt.changes new/yast2-qt-2.17.5/package/yast2-qt.changes
--- old/yast2-qt-2.17.4/package/yast2-qt.changes 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/package/yast2-qt.changes 2008-08-05 11:15:28.000000000 +0200
@@ -1,4 +1,20 @@
-------------------------------------------------------------------
+Tue Aug 5 11:14:01 CEST 2008 - tgoettlicher@suse.de
+
+- V 2.18.5
+
+-------------------------------------------------------------------
+Tue Aug 5 10:54:04 CEST 2008 - tgoettlicher@suse.de
+
+- Fixed bnc #409612: popup menu during installation becomes
+ hidden because of NULL parent
+
+-------------------------------------------------------------------
+Tue Jul 29 11:21:53 CEST 2008 - tgoettlicher@suse.de
+
+- Fixed sorting in Table (bnc #399206)
+
+-------------------------------------------------------------------
Tue Jul 15 19:13:57 CEST 2008 - sh@suse.de
- Implemented fate #303492: Multi selection for table widget
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQApplication.cc new/yast2-qt-2.17.5/src/YQApplication.cc
--- old/yast2-qt-2.17.4/src/YQApplication.cc 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQApplication.cc 2008-08-05 11:15:28.000000000 +0200
@@ -483,12 +483,18 @@
QString fileName;
bool tryAgain = false;
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+
do
{
// Leave the mouse cursor alone - this function might be called from
// some other widget, not only from UI::AskForSaveFileName().
- fileName = QFileDialog::getSaveFileName( 0, // parent
+ fileName = QFileDialog::getSaveFileName( parent, // parent
headline, // caption
startWith, // dir
filter ); // filter
@@ -512,7 +518,7 @@
msg = ( _( "%1 exists and is write-protected!\nReally overwrite?" ) ).arg( fileName );
}
- int buttonNo = QMessageBox::information( 0, // parent widget
+ int buttonNo = QMessageBox::information( parent,
// Translators: Window title for confirmation dialog
_( "Confirm" ),
msg,
@@ -588,7 +594,13 @@
"\n"
"Switch left and right mouse buttons?"
);
- int button = QMessageBox::question( 0,
+
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+ int button = QMessageBox::question( parent,
// Popup dialog caption
_( "Unexpected Click" ),
message,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQDialog.cc new/yast2-qt-2.17.5/src/YQDialog.cc
--- old/yast2-qt-2.17.4/src/YQDialog.cc 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQDialog.cc 2008-08-05 11:15:28.000000000 +0200
@@ -576,8 +576,13 @@
if ( YQUI::ui()->usingVisionImpairedPalette() )
{
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
yuiMilestone() << "Switched to vision impaired palette" << endl;
- QMessageBox::information( 0, // parent
+ QMessageBox::information( parent, // parent
_("Color switching"), // caption
_( "Switching to color palette for vision impaired users -\n"
"press Shift-F4 again to switch back to normal colors." ), // text
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQMenuButton.cc new/yast2-qt-2.17.5/src/YQMenuButton.cc
--- old/yast2-qt-2.17.4/src/YQMenuButton.cc 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQMenuButton.cc 2008-08-05 11:15:28.000000000 +0200
@@ -96,9 +96,7 @@
{
for ( YItemIterator it = begin; it != end; ++it )
{
- YMenuItem * item = dynamic_cast (*it);
- YUI_CHECK_PTR( item );
-
+ YItem * item = *it;
QPixmap icon;
if ( item->hasIconName() )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.cc new/yast2-qt-2.17.5/src/YQTable.cc
--- old/yast2-qt-2.17.4/src/YQTable.cc 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQTable.cc 2008-08-05 11:15:28.000000000 +0200
@@ -47,7 +47,7 @@
YUI_CHECK_NEW( _qt_listView );
layout->addWidget( _qt_listView );
_qt_listView->setAllColumnsShowFocus( true );
- _qt_listView->setSortingEnabled( ! keepSorting() );
+ setKeepSorting( keepSorting() );
if ( multiSelectionMode )
_qt_listView->setSelectionMode( QAbstractItemView::ExtendedSelection );
@@ -147,6 +147,8 @@
clone->setTextAlignment( i, qt_alignment );
}
+
+ _qt_listView->sortItems ( 0, Qt::AscendingOrder) ;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.cc.bak new/yast2-qt-2.17.5/src/YQTable.cc.bak
--- old/yast2-qt-2.17.4/src/YQTable.cc.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQTable.cc.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,408 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YQTable.cc
-
- Author: Stefan Hundhammer
-
-/-*/
-
-#include <QHeaderView>
-#include <QVBoxLayout>
-#include <QString>
-#define YUILogComponent "qt-ui"
-#include "YUILog.h"
-
-#include "utf8.h"
-#include "YQUI.h"
-#include "YEvent.h"
-#include "YQSignalBlocker.h"
-#include "YUIException.h"
-
-#include "QY2ListView.h"
-#include "YQTable.h"
-
-
-YQTable::YQTable( YWidget * parent, YTableHeader * tableHeader, bool multiSelectionMode )
- : QFrame( (QWidget *) parent->widgetRep() )
- , YTable( parent, tableHeader, multiSelectionMode )
-{
- setWidgetRep( this );
- QVBoxLayout* layout = new QVBoxLayout( this );
- layout->setSpacing( 0 );
- setLayout( layout );
-
- layout->setMargin( YQWidgetMargin );
-
- _qt_listView = new QY2ListView( this );
- YUI_CHECK_NEW( _qt_listView );
- layout->addWidget( _qt_listView );
- _qt_listView->setAllColumnsShowFocus( true );
- _qt_listView->setSortingEnabled( ! keepSorting() );
-
- if ( multiSelectionMode )
- _qt_listView->setSelectionMode( QAbstractItemView::ExtendedSelection );
-
-
- //
- // Add columns
- //
-
- QStringList headers;
- _qt_listView->setColumnCount( columns() );
-
- for ( int i=0; i < columns(); i++ )
- {
- headers << fromUTF8(header(i));
- }
-
-
- _qt_listView->setHeaderLabels( headers );
- _qt_listView->header()->setResizeMode( QHeaderView::ResizeToContents );
-
- //
- // Connect signals and slots
- //
-
- connect( _qt_listView, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) );
-
- connect( _qt_listView, SIGNAL( itemActivated ( QTreeWidgetItem *, int ) ),
- this, SLOT ( slotActivated ( QTreeWidgetItem * ) ) );
-
- connect( _qt_listView, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ),
- this, SLOT ( slotSelected ( QTreeWidgetItem * ) ) );
-
- if ( multiSelectionMode )
- {
- // This is the exceptional case - avoid performance drop in the normal case
-
- connect( _qt_listView, SIGNAL( itemSelectionChanged() ),
- this, SLOT ( slotSelectionChanged() ) );
-
- }
-}
-
-
-YQTable::~YQTable()
-{
- // NOP
-}
-
-
-void
-YQTable::setKeepSorting( bool keepSorting )
-{
- YTable::setKeepSorting( keepSorting );
- _qt_listView->setSortByInsertionSequence( keepSorting );
- _qt_listView->setSortingEnabled( ! keepSorting );
-}
-
-
-void
-YQTable::addItem( YItem * yitem )
-{
- YTableItem * item = dynamic_cast (yitem);
- YUI_CHECK_PTR( item );
-
- YTable::addItem( item );
-
- YQTableListViewItem * clone = new YQTableListViewItem( this, _qt_listView, item );
- YUI_CHECK_NEW( clone );
-
- if ( item->selected() )
- {
- // YTable enforces single selection, if appropriate
-
- YQSignalBlocker sigBlocker( _qt_listView );
- YQTable::selectItem( YSelectionWidget::selectedItem(), true );
- }
-
-
- //
- // Set column alignment
- //
-
- for ( int i=0; i < columns(); i++ )
- {
- int qt_alignment = Qt::AlignLeft;
-
- switch ( alignment( i ) )
- {
- case YAlignBegin: qt_alignment = Qt::AlignLeft; break;
- case YAlignCenter: qt_alignment = Qt::AlignCenter; break;
- case YAlignEnd: qt_alignment = Qt::AlignRight; break;
-
- case YAlignUnchanged: break;
- }
-
- clone->setTextAlignment(i, qt_alignment);
- }
-}
-
-
-void
-YQTable::selectItem( YItem * yitem, bool selected )
-{
- YQSignalBlocker sigBlocker( _qt_listView );
-
- YTableItem * item = dynamic_cast (yitem);
- YUI_CHECK_PTR( item );
-
- YQTableListViewItem * clone = (YQTableListViewItem *) item->data();
- YUI_CHECK_PTR( clone );
-
- //FIXME selected first
- if ( ! selected && clone == _qt_listView->currentItem() )
- {
- deselectAllItems();
- }
- else
- {
- _qt_listView->setCurrentItem( clone );
- clone->setSelected( true );
- YTable::selectItem( item, selected );
- }
-}
-
-
-void
-YQTable::deselectAllItems()
-{
- YQSignalBlocker sigBlocker( _qt_listView );
-
- YTable::deselectAllItems();
- _qt_listView->clearSelection();
-}
-
-
-void
-YQTable::deleteAllItems()
-{
- _qt_listView->clear();
- YTable::deleteAllItems();
-}
-
-
-void
-YQTable::cellChanged( const YTableCell * cell )
-{
- YTableItem * item = cell->parent();
- YUI_CHECK_PTR( item );
-
- YQTableListViewItem * clone = (YQTableListViewItem *) item->data();
- YUI_CHECK_PTR( clone );
-
- clone->updateCell( cell );
-}
-
-
-void
-YQTable::selectOrigItem( QTreeWidgetItem * listViewItem )
-{
- if ( listViewItem )
- {
- YQTableListViewItem * tableListViewItem = dynamic_cast (listViewItem);
- YUI_CHECK_PTR( tableListViewItem );
-
- YTable::selectItem( tableListViewItem->origItem(), true );
- }
-}
-
-
-void
-YQTable::slotSelected( QTreeWidgetItem * listViewItem )
-{
- if ( listViewItem )
- selectOrigItem( listViewItem );
- else
- {
- // Qt might select nothing if a user clicks outside the items in the widget
-
- if ( hasItems() && YSelectionWidget::hasSelectedItem() )
- YQTable::selectItem( YSelectionWidget::selectedItem(), true );
- }
-
- if ( immediateMode() )
- {
- if ( ! YQUI::ui()->eventPendingFor( this ) )
- {
- // Avoid overwriting a (more important) Activated event with a SelectionChanged event
-
- yuiDebug() << "Sending SelectionChanged event" << endl;
- YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) );
- }
- }
-}
-
-
-void
-YQTable::slotSelectionChanged()
-{
- YSelectionWidget::deselectAllItems();
- yuiDebug() << endl;
-
- QList selItems = _qt_listView->selectedItems();
-
- for ( QList::iterator it = selItems.begin();
- it != selItems.end();
- ++it )
- {
- YQTableListViewItem * tableListViewItem = dynamic_cast (*it);
-
- if ( tableListViewItem )
- {
- tableListViewItem->origItem()->setSelected( true );
-
- yuiDebug() << "Selected item: " << tableListViewItem->origItem()->label() << endl;
- }
- }
-
- if ( immediateMode() )
- {
- if ( ! YQUI::ui()->eventPendingFor( this ) )
- {
- // Avoid overwriting a (more important) Activated event with a SelectionChanged event
-
- yuiDebug() << "Sending SelectionChanged event" << endl;
- YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) );
- }
- }
-}
-
-
-void
-YQTable::slotActivated( QTreeWidgetItem * listViewItem )
-{
- selectOrigItem( listViewItem );
-
- if ( notify() )
- {
- yuiDebug() << "Sending Activated event" << endl;
- YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) );
- }
-}
-
-
-void
-YQTable::setEnabled( bool enabled )
-{
- _qt_listView->setEnabled( enabled );
- //FIXME _qt_listView->triggerUpdate();
- YWidget::setEnabled( enabled );
-}
-
-
-
-int
-YQTable::preferredWidth()
-{
- // Arbitrary value.
- // Use a MinSize widget to set a size that is useful for the application.
-
- return 30;
-}
-
-
-int
-YQTable::preferredHeight()
-{
- // Arbitrary value.
- // Use a MinSize widget to set a size that is useful for the application.
-
- return 30;
-}
-
-
-void
-YQTable::setSize( int newWidth, int newHeight )
-{
- resize( newWidth, newHeight );
-}
-
-
-bool
-YQTable::setKeyboardFocus()
-{
- _qt_listView->setFocus();
-
- return true;
-}
-
-
-
-
-
-
-YQTableListViewItem::YQTableListViewItem( YQTable * table,
- QY2ListView * parent,
- YTableItem * origItem )
- : QY2ListViewItem( parent )
- , _table( table )
- , _origItem( origItem )
-{
- YUI_CHECK_PTR( _table );
- YUI_CHECK_PTR( _origItem );
-
- _origItem->setData( this );
-
- for ( YTableCellIterator it = _origItem->cellsBegin();
- it != _origItem->cellsEnd();
- ++it )
- {
- updateCell( *it );
- }
-}
-
-
-void
-YQTableListViewItem::updateCell( const YTableCell * cell )
-{
- if ( ! cell )
- return;
-
- int column = cell->column();
-
- //
- // Set label text
- //
-
- setText( column, fromUTF8( cell->label() ) );
-
-
- //
- // Set icon (if specified)
- //
-
- if ( cell->hasIconName() )
- {
- // _table is checked against 0 in the constructor
-
- string iconName = _table->iconFullPath( cell->iconName() );
- QPixmap icon = QPixmap( iconName.c_str() );
-
- if ( icon.isNull() )
- yuiWarning() << "Can't load icon " << iconName << endl;
- else
- setData( column, Qt::DecorationRole, icon );
- }
- else // No pixmap name
- {
- if ( ! data( column, Qt::DecorationRole ).isNull() ) // Was there a pixmap before?
- {
- setData( column, Qt::DecorationRole, QPixmap() ); // Set empty pixmap
- }
- }
-}
-
-
-#include "YQTable.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQTable.h.bak new/yast2-qt-2.17.5/src/YQTable.h.bak
--- old/yast2-qt-2.17.4/src/YQTable.h.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQTable.h.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,197 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YQTable.h
-
- Author: Stefan Hundhammer
-
-/-*/
-
-#ifndef YQTable_h
-#define YQTable_h
-
-#include <QFrame>
-#include "QY2ListView.h"
-#include "YTable.h"
-
-
-class QY2ListView;
-class QTreeWidgetItem;
-class YQListViewItem;
-
-class YQTable : public QFrame, public YTable
-{
- Q_OBJECT
-
-public:
-
- /**
- * Constructor.
- **/
- YQTable( YWidget * parent, YTableHeader * header );
-
- /**
- * Destructor.
- **/
- virtual ~YQTable();
-
- /**
- * Switch between sorting by item insertion order (keepSorting: true) or
- * allowing the user to sort by an arbitrary column (by clicking on the
- * column header).
- *
- * Reimplemented from YTable.
- **/
- virtual void setKeepSorting( bool keepSorting );
-
- /**
- * Add an item.
- *
- * Reimplemented from YSelectionWidget.
- **/
- virtual void addItem( YItem * item );
-
- /**
- * Select or deselect an item.
- *
- * Reimplemented from YSelectionWidget.
- **/
- virtual void selectItem( YItem * item, bool selected = true );
-
- /**
- * Deselect all items.
- *
- * Reimplemented from YSelectionWidget.
- **/
- virtual void deselectAllItems();
-
- /**
- * Delete all items.
- *
- * Reimplemented from YSelectionWidget.
- **/
- virtual void deleteAllItems();
-
- /**
- * Notification that a cell (its text and/or its icon) was changed from the
- * outside. Applications are required to call this whenever a table cell is
- * changed after adding the corresponding table item (the row) to the table
- * widget.
- *
- * Reimplemented from YTable.
- **/
- virtual void cellChanged( const YTableCell * cell );
-
- /**
- * Set enabled/disabled state.
- *
- * Reimplemented from YWidget.
- **/
- virtual void setEnabled( bool enabled );
-
- /**
- * Preferred width of the widget.
- *
- * Reimplemented from YWidget.
- **/
- virtual int preferredWidth();
-
- /**
- * Preferred height of the widget.
- *
- * Reimplemented from YWidget.
- **/
- virtual int preferredHeight();
-
- /**
- * Set the new size of the widget.
- *
- * Reimplemented from YWidget.
- **/
- virtual void setSize( int newWidth, int newHeight );
-
- /**
- * Accept the keyboard focus.
- *
- * Reimplemented from YWidget.
- **/
- virtual bool setKeyboardFocus();
-
-
-protected slots:
-
- /**
- * Notification that an item is selected (single click or keyboard).
- **/
- void slotSelected( QTreeWidgetItem * );
-
- /**
- * Notification that an item is activated (double click or keyboard).
- **/
- void slotActivated( QTreeWidgetItem * );
-
-
-protected:
-
- /**
- * Select the original item (the YTableItem) that corresponds to the
- * specified listViewItem.
- **/
- void selectOrigItem( QTreeWidgetItem * listViewItem );
-
- //
- // Data members
- //
-
- QY2ListView * _qt_listView;
-};
-
-
-
-/**
- * Visual representation of a YTableItem.
- **/
-class YQTableListViewItem: public QY2ListViewItem
-{
-public:
-
- /**
- * Constructor.
- **/
- YQTableListViewItem( YQTable * table,
- QY2ListView * parent,
- YTableItem * origItem );
-
- /**
- * Return the parent table widget.
- **/
- YQTable * table() const { return _table; }
-
- /**
- * Return the corresponding YTableItem.
- **/
- YTableItem * origItem() const { return _origItem; }
-
- /**
- * Update this item's display with the content of 'cell'.
- **/
- void updateCell( const YTableCell * cell );
-
-protected:
-
- YQTable * _table;
- YTableItem * _origItem;
-};
-
-
-
-#endif // YQLabel_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQUI_builtins.cc new/yast2-qt-2.17.5/src/YQUI_builtins.cc
--- old/yast2-qt-2.17.4/src/YQUI_builtins.cc 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQUI_builtins.cc 2008-08-05 11:15:28.000000000 +0200
@@ -182,7 +182,12 @@
if ( interactive )
{
- QMessageBox::warning( 0, // parent
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+ QMessageBox::warning( parent, // parent
"Error", // caption
QString( "Couldn't save screen shot\nto %1" ).arg( fileName ),
QMessageBox::Ok | QMessageBox::Default, // button0
@@ -199,6 +204,12 @@
QString( "*.tgz *.tar.gz" ), // filter
QString( "Save y2logs to..." ) ); // headline
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+
if ( ! fileName.isEmpty() )
{
QString saveLogsCommand = "/sbin/save_y2logs";
@@ -215,7 +226,7 @@
<< "\" exited with " << result
<< endl;
- QMessageBox::warning( 0, // parent
+ QMessageBox::warning( parent, // parent
"Error", // caption
QString( "Couldn't save y2logs to %1 - "
"exit code %2" ).arg( fileName ).arg( result ),
@@ -234,7 +245,7 @@
<< saveLogsCommand << "\" not found"
<< endl;
- QMessageBox::warning( 0, // parent
+ QMessageBox::warning( parent, // parent
"Error", // caption
QString( "Couldn't save y2logs to %1:\n"
"Command %2 not found" ).arg( fileName ).arg( saveLogsCommand ),
@@ -253,7 +264,13 @@
items << "Debug logging off"
<< "Debug logging on";
- QString result = QInputDialog::getItem( 0,
+
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+ QString result = QInputDialog::getItem( parent,
_("YaST2 Logging"),
_("Configure YaST2 Logging:"),
items, 0,
@@ -269,12 +286,18 @@
void YQUI::toggleRecordMacro()
{
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+
if ( YMacro::recording() )
{
YMacro::endRecording();
normalCursor();
- QMessageBox::information( 0, // parent
+ QMessageBox::information( parent, // parent
"YaST2 Macro Recorder", // caption
"Macro recording done.", // text
QMessageBox::Ok | QMessageBox::Default, // button0
@@ -286,7 +309,7 @@
normalCursor();
QString filename =
- QFileDialog::getSaveFileName( 0,
+ QFileDialog::getSaveFileName( parent,
"Select Macro File to Record to",
DEFAULT_MACRO_FILE_NAME, // startWith
"*.ycp" // filter
@@ -304,8 +327,14 @@
{
normalCursor();
+ QWidget* parent = 0;
+ YDialog * currentDialog = YDialog::currentDialog( false );
+ if (currentDialog)
+ parent = (QWidget *) currentDialog->widgetRep();
+
+
QString filename =
- QFileDialog::getOpenFileName( 0,
+ QFileDialog::getOpenFileName( parent,
"Select Macro File to Play",
DEFAULT_MACRO_FILE_NAME, // startWith
"*.ycp" );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQWidgetFactory.cc.bak new/yast2-qt-2.17.5/src/YQWidgetFactory.cc.bak
--- old/yast2-qt-2.17.4/src/YQWidgetFactory.cc.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQWidgetFactory.cc.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,404 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YQWidgetFactory.cc
-
- Author: Stefan Hundhammer
-
-/-*/
-
-#include <QColorGroup>
-#define YUILogComponent "qt-ui"
-#include "YUILog.h"
-
-#include "YQWidgetFactory.h"
-#include "YQApplication.h"
-#include "YUIException.h"
-#include "YQPackageSelectorPluginStub.h"
-#include "YQMainWinDock.h"
-
-#include <string>
-
-using std::string;
-
-
-YQWidgetFactory::YQWidgetFactory()
- : YWidgetFactory()
-{
- // NOP
-}
-
-
-YQWidgetFactory::~YQWidgetFactory()
-{
- // NOP
-}
-
-
-
-
-//
-// Dialogs
-//
-
-YQDialog *
-YQWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode )
-{
- YQDialog * dialog = new YQDialog( dialogType, colorMode );
- YUI_CHECK_NEW( dialog );
-
- return dialog;
-}
-
-
-
-//
-// Layout Boxes
-//
-
-YQLayoutBox *
-YQWidgetFactory::createLayoutBox( YWidget * parent, YUIDimension dim )
-{
- YQLayoutBox * layoutBox = new YQLayoutBox( parent, dim );
- YUI_CHECK_NEW( layoutBox );
-
- return layoutBox;
-}
-
-
-
-//
-// Common Leaf Widgets
-//
-
-YQPushButton *
-YQWidgetFactory::createPushButton( YWidget * parent, const string & label )
-{
- YQPushButton * pushButton = new YQPushButton( parent, label );
- YUI_CHECK_NEW( pushButton );
-
- return pushButton;
-}
-
-
-
-YQLabel *
-YQWidgetFactory::createLabel( YWidget * parent,
- const string & text,
- bool isHeading,
- bool isOutputField )
-{
- YQLabel * label = new YQLabel( parent, text, isHeading, isOutputField );
- YUI_CHECK_NEW( label );
-
- return label;
-}
-
-
-
-YQInputField *
-YQWidgetFactory::createInputField( YWidget * parent, const string & label, bool passwordMode )
-{
- YQInputField * inputField = new YQInputField( parent, label, passwordMode );
- YUI_CHECK_NEW( inputField );
-
- return inputField;
-}
-
-
-
-YQCheckBox *
-YQWidgetFactory::createCheckBox( YWidget * parent, const string & label, bool isChecked )
-{
- YQCheckBox * checkBox = new YQCheckBox( parent, label, isChecked );
- YUI_CHECK_NEW( checkBox );
-
- return checkBox;
-}
-
-
-
-YQRadioButton *
-YQWidgetFactory::createRadioButton( YWidget * parent, const string & label, bool isChecked )
-{
- YQRadioButton * radioButton = new YQRadioButton( parent, label, isChecked );
- YUI_CHECK_NEW( radioButton );
-
- // Register radio button with its button group.
- // This has to be done after all constructors are done so virtual functions
- // can be used.
-
- if ( radioButton->buttonGroup() )
- radioButton->buttonGroup()->addRadioButton( radioButton );
-
- return radioButton;
-}
-
-
-
-YQComboBox *
-YQWidgetFactory::createComboBox( YWidget * parent, const string & label, bool editable )
-{
- YQComboBox * comboBox = new YQComboBox( parent, label, editable );
- YUI_CHECK_NEW( comboBox );
-
- return comboBox;
-}
-
-
-
-YQSelectionBox *
-YQWidgetFactory::createSelectionBox( YWidget * parent, const string & label )
-{
- YQSelectionBox * selectionBox = new YQSelectionBox( parent, label );
- YUI_CHECK_NEW( selectionBox );
-
- return selectionBox;
-}
-
-
-
-YQTree *
-YQWidgetFactory::createTree( YWidget * parent, const string & label )
-{
- YQTree * tree = new YQTree( parent, label );
- YUI_CHECK_NEW( tree );
-
- return tree;
-}
-
-
-
-YQTable *
-YQWidgetFactory::createTable( YWidget * parent, YTableHeader * header )
-{
- YQTable * table = new YQTable( parent, header );
- YUI_CHECK_NEW( table );
-
- return table;
-}
-
-
-
-YQProgressBar *
-YQWidgetFactory::createProgressBar( YWidget * parent, const string & label, int maxValue )
-{
- YQProgressBar * progressBar = new YQProgressBar( parent, label, maxValue );
- YUI_CHECK_NEW( progressBar );
-
- return progressBar;
-}
-
-
-
-YQRichText *
-YQWidgetFactory::createRichText( YWidget * parent, const string & text, bool plainTextMode )
-{
- YQRichText * richText = new YQRichText( parent, text, plainTextMode );
- YUI_CHECK_NEW( richText );
-
- return richText;
-}
-
-
-YQBusyIndicator *
-YQWidgetFactory::createBusyIndicator( YWidget * parent, const string & label, int maxValue )
-{
- YQBusyIndicator * busyIndicator = new YQBusyIndicator( parent, label, maxValue );
- YUI_CHECK_NEW( busyIndicator );
-
- return busyIndicator;
-}
-
-
-
-
-//
-// Less Common Leaf Widgets
-//
-
-YQIntField *
-YQWidgetFactory::createIntField( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal )
-{
- YQIntField * intField = new YQIntField( parent, label, minVal, maxVal, initialVal );
- YUI_CHECK_NEW( intField );
-
- return intField;
-}
-
-
-
-YQMenuButton *
-YQWidgetFactory::createMenuButton( YWidget * parent, const string & label )
-{
- YQMenuButton * menuButton = new YQMenuButton( parent, label );
- YUI_CHECK_NEW( menuButton );
-
- return menuButton;
-}
-
-
-
-YQMultiLineEdit *
-YQWidgetFactory::createMultiLineEdit( YWidget * parent, const string & label )
-{
- YQMultiLineEdit * multiLineEdit = new YQMultiLineEdit( parent, label );
- YUI_CHECK_NEW( multiLineEdit );
-
- return multiLineEdit;
-}
-
-
-
-YQImage *
-YQWidgetFactory::createImage( YWidget * parent, const string & imageFileName, bool animated )
-{
- YQImage * image = new YQImage( parent, imageFileName, animated );
- YUI_CHECK_NEW( image );
-
- return image;
-}
-
-
-YQLogView *
-YQWidgetFactory::createLogView( YWidget * parent, const string & label, int visibleLines, int storedLines )
-{
- YQLogView * logView = new YQLogView( parent, label, visibleLines, storedLines );
- YUI_CHECK_NEW( logView );
-
- return logView;
-}
-
-
-
-YQMultiSelectionBox *
-YQWidgetFactory::createMultiSelectionBox( YWidget * parent, const string & label )
-{
- YQMultiSelectionBox * multiSelectionBox = new YQMultiSelectionBox( parent, label );
- YUI_CHECK_NEW( multiSelectionBox );
-
- return multiSelectionBox;
-}
-
-YPackageSelector*
-YQWidgetFactory::createPackageSelector(YWidget* parent, long modeFlags)
-{
- YQPackageSelectorPluginStub * plugin = YQApplication::packageSelectorPlugin();
- YUI_CHECK_PTR( plugin );
-
-
- YPackageSelector * pkgSel = plugin->createPackageSelector( parent, modeFlags );
- YUI_CHECK_NEW( pkgSel );
-
- return pkgSel;
-}
-
-YWidget *
-YQWidgetFactory::createPkgSpecial( YWidget * , const string & )
-{
- YUI_THROW( YUIUnsupportedWidgetException( "YQPkgSpecial" ) ); // NCurses only
- return 0;
-}
-
-
-//
-// Layout Helpers
-//
-
-YQSpacing *
-YQWidgetFactory::createSpacing( YWidget * parent, YUIDimension dim, bool stretchable, YLayoutSize_t size )
-{
- YQSpacing * spacing = new YQSpacing( parent, dim, stretchable, size );
- YUI_CHECK_NEW( spacing );
-
- return spacing;
-}
-
-
-YQEmpty *
-YQWidgetFactory::createEmpty( YWidget * parent )
-{
- YQEmpty * empty = new YQEmpty( parent );
- YUI_CHECK_NEW( empty );
-
- return empty;
-}
-
-
-
-YQAlignment *
-YQWidgetFactory::createAlignment( YWidget * parent,
- YAlignmentType horAlignment,
- YAlignmentType vertAlignment )
-{
- YQAlignment * alignment = new YQAlignment( parent, horAlignment, vertAlignment );
- YUI_CHECK_NEW( alignment );
-
- return alignment;
-}
-
-
-YQSquash *
-YQWidgetFactory::createSquash( YWidget * parent, bool horSquash, bool vertSquash )
-{
- YQSquash * squash = new YQSquash( parent, horSquash, vertSquash );
- YUI_CHECK_NEW( squash );
-
- return squash;
-}
-
-
-
-YQFrame *
-YQWidgetFactory::createFrame( YWidget * parent, const string & label )
-{
- YQFrame * frame = new YQFrame( parent, label );
- YUI_CHECK_NEW( frame );
-
- return frame;
-}
-
-
-
-YQCheckBoxFrame *
-YQWidgetFactory::createCheckBoxFrame( YWidget * parent, const string & label, bool checked )
-{
- YQCheckBoxFrame * checkBoxFrame = new YQCheckBoxFrame( parent, label, checked );
- YUI_CHECK_NEW( checkBoxFrame );
-
- return checkBoxFrame;
-}
-
-
-
-YQRadioButtonGroup *
-YQWidgetFactory::createRadioButtonGroup( YWidget * parent )
-{
- YQRadioButtonGroup * radioButtonGroup = new YQRadioButtonGroup( parent );
- YUI_CHECK_NEW( radioButtonGroup );
-
- return radioButtonGroup;
-}
-
-
-
-YQReplacePoint *
-YQWidgetFactory::createReplacePoint( YWidget * parent )
-{
- YQReplacePoint * replacePoint = new YQReplacePoint( parent );
- YUI_CHECK_NEW( replacePoint );
-
- return replacePoint;
-}
-
-
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/src/YQWidgetFactory.h.bak new/yast2-qt-2.17.5/src/YQWidgetFactory.h.bak
--- old/yast2-qt-2.17.4/src/YQWidgetFactory.h.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/src/YQWidgetFactory.h.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,155 +0,0 @@
-/*---------------------------------------------------------------------\
-| |
-| __ __ ____ _____ ____ |
-| \ \ / /_ _/ ___|_ _|___ \ |
-| \ V / _` \___ \ | | __) | |
-| | | (_| |___) || | / __/ |
-| |_|\__,_|____/ |_| |_____| |
-| |
-| core system |
-| (C) SuSE GmbH |
-\----------------------------------------------------------------------/
-
- File: YQWidgetFactory.h
-
- Author: Stefan Hundhammer
-
-/-*/
-
-#ifndef YQWidgetFactory_h
-#define YQWidgetFactory_h
-
-
-#include "YWidgetFactory.h"
-
-#include "YQAlignment.h"
-#include "YQCheckBox.h"
-#include "YQCheckBoxFrame.h"
-#include "YQComboBox.h"
-#include "YQDialog.h"
-#include "YQEmpty.h"
-#include "YQFrame.h"
-#include "YQImage.h"
-#include "YQInputField.h"
-#include "YQIntField.h"
-#include "YQLabel.h"
-#include "YQLayoutBox.h"
-#include "YQLogView.h"
-#include "YQMenuButton.h"
-#include "YQMultiLineEdit.h"
-#include "YQMultiSelectionBox.h"
-#include "YQProgressBar.h"
-#include "YQPushButton.h"
-#include "YQRadioButton.h"
-#include "YQRadioButtonGroup.h"
-#include "YQReplacePoint.h"
-#include "YQRichText.h"
-#include "YQSelectionBox.h"
-#include "YQSpacing.h"
-#include "YQSquash.h"
-#include "YQTable.h"
-#include "YQTimeField.h"
-#include "YQTree.h"
-#include "YQBusyIndicator.h"
-
-using std::string;
-
-
-/**
- * Concrete widget factory for mandatory widgets.
- **/
-class YQWidgetFactory: public YWidgetFactory
-{
-public:
- // Note: Using covariant return types for all createSomeWidget() methods
- // (returning YQSomeWidget where the base class declares virtual methods that
- // return YSomeWidget)
-
-
- //
- // Dialogs
- //
-
- virtual YQDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor );
-
- //
- // Layout Boxes
- //
-
- virtual YQLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim );
-
- //
- // Common Leaf Widgets
- //
-
- virtual YQPushButton * createPushButton ( YWidget * parent, const string & label );
- virtual YQLabel * createLabel ( YWidget * parent, const string & text, bool isHeading = false, bool isOutputField = false );
- virtual YQInputField * createInputField ( YWidget * parent, const string & label, bool passwordMode = false );
- virtual YQCheckBox * createCheckBox ( YWidget * parent, const string & label, bool isChecked = false );
- virtual YQRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false );
- virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false );
- virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label );
- virtual YQTree * createTree ( YWidget * parent, const string & label );
- virtual YQTable * createTable ( YWidget * parent, YTableHeader * header, bool multiSelection = false );
- virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 );
- virtual YQRichText * createRichText ( YWidget * parent, const string & text = string(), bool plainTextMode = false );
- virtual YQBusyIndicator * createBusyIndicator ( YWidget * parent, const string & label, int maxValue = 100 );
-
- //
- // Less Common Leaf Widgets
- //
-
- virtual YQIntField * createIntField ( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal );
- virtual YQMenuButton * createMenuButton ( YWidget * parent, const string & label );
- virtual YQMultiLineEdit * createMultiLineEdit ( YWidget * parent, const string & label );
- virtual YQImage * createImage ( YWidget * parent, const string & imageFileName, bool animated = false );
- virtual YQLogView * createLogView ( YWidget * parent, const string & label, int visibleLines, int storedLines = 0 );
- virtual YQMultiSelectionBox *createMultiSelectionBox( YWidget * parent, const string & label );
-
- virtual YPackageSelector * createPackageSelector ( YWidget * parent, long modeFlags = 0 );
- virtual YWidget * createPkgSpecial ( YWidget * parent, const string & name ); // NCurses only, will throw exception in the Qt UI
-
- //
- // Layout Helpers
- //
-
- virtual YQSpacing * createSpacing ( YWidget * parent, YUIDimension dim, bool stretchable = false, YLayoutSize_t size = 0.0 );
- virtual YQEmpty * createEmpty ( YWidget * parent );
- virtual YQAlignment * createAlignment ( YWidget * parent, YAlignmentType horAlignment, YAlignmentType vertAlignment );
- virtual YQSquash * createSquash ( YWidget * parent, bool horSquash, bool vertSquash );
-
- //
- // Visual Grouping
- //
-
- virtual YQFrame * createFrame ( YWidget * parent, const string & label );
- virtual YQCheckBoxFrame * createCheckBoxFrame ( YWidget * parent, const string & label, bool checked );
-
- //
- // Logical Grouping
- //
-
- virtual YQRadioButtonGroup *createRadioButtonGroup ( YWidget * parent );
- virtual YQReplacePoint * createReplacePoint ( YWidget * parent );
-
-
-protected:
-
- friend class YQUI;
-
- /**
- * Constructor.
- *
- * Use YUI::widgetFactory() to get the singleton for this class.
- **/
- YQWidgetFactory();
-
- /**
- * Destructory.
- **/
- virtual ~YQWidgetFactory();
-
-}; // class YWidgetFactory
-
-
-#endif // YQWidgetFactory_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/VERSION.cmake new/yast2-qt-2.17.5/VERSION.cmake
--- old/yast2-qt-2.17.4/VERSION.cmake 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/VERSION.cmake 2008-08-05 11:15:28.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "17")
-SET(VERSION_PATCH "4")
+SET(VERSION_PATCH "5")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/VERSION.cmake.bak new/yast2-qt-2.17.5/VERSION.cmake.bak
--- old/yast2-qt-2.17.4/VERSION.cmake.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/VERSION.cmake.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "17")
-SET(VERSION_PATCH "3")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.17.4/yast2-qt.spec.in.bak new/yast2-qt-2.17.5/yast2-qt.spec.in.bak
--- old/yast2-qt-2.17.4/yast2-qt.spec.in.bak 2008-07-16 14:35:11.000000000 +0200
+++ new/yast2-qt-2.17.5/yast2-qt.spec.in.bak 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-@HEADERCOMMENT@
-
-
-@HEADER@
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: doxygen
-BuildRequires: libdrm-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libxcrypt-devel
-BuildRequires: libxslt
-BuildRequires: perl-XML-Writer
-BuildRequires: libqt4-devel
-BuildRequires: sgml-skel
-BuildRequires: update-desktop-files
-BuildRequires: cmake
-
-Summary: -
-BuildRequires: yast2-devtools >= 2.16.3
-BuildRequires: yast2-libyui-devel >= 2.17.3
-Requires: yast2-libyui >= 2.17.3
-Requires: yast2_theme >= 2.16.1
-Provides: yast2_ui
-Provides: y2base:/usr/lib/YaST2/servers/qt
-Provides: y2base:/usr/lib/YaST2/plugin/libpy2qt.so.2
-Provides: yast2-ui-qt yast2-ui-qt-devel
-Obsoletes: yast2-ui-qt yast2-ui-qt-devel
-Provides: y2qt
-Obsoletes: y2qt
-Recommends: yast2-qt-pkg
-
-%description
--
-
-%package devel
-Summary: -
-Group: Development/Libraries
-Requires: yast2-qt = %{version}
-Requires: yast2-libyui-devel
-
-%description devel
--
-
-%prep
-%setup
-
-%build
-mkdir build
-cd build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DLIB=%{_lib} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=1 \
- ..
-make %{?jobs:-j %jobs} VERBOSE=1
-
-%install
-cd build
-make install DESTDIR=$RPM_BUILD_ROOT
-cd ..
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%files
-%defattr (-, root, root)
-%dir %_libdir/YaST2
-%_libdir/YaST2/plugin/
-%_prefix/share/YaST2/data/lang_fonts
-
-%files devel
-%defattr (-, root, root)
-%_includedir/*
-
-%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org