Hello community,
here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory
checked in at Thu Apr 28 14:23:06 CEST 2011.
--------
--- yast2-qt-pkg/yast2-qt-pkg.changes 2011-02-03 15:15:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-qt-pkg/yast2-qt-pkg.changes 2011-04-27 17:06:21.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Apr 27 17:05:04 CEST 2011 - tgoettlicher(a)suse.de
+
+- Added translation markers for RPM fields (bnc #686502)
+- 2.21.2
+
+-------------------------------------------------------------------
+Wed Apr 27 16:27:50 CEST 2011 - tgoettlicher(a)suse.de
+
+- Enabled menu key to show context menu (bnc #681702)
+- 2.21.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-qt-pkg-2.20.3.tar.bz2
New:
----
yast2-qt-pkg-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt-pkg.spec ++++++
--- /var/tmp/diff_new_pack.0tspGr/_old 2011-04-28 13:53:47.000000000 +0200
+++ /var/tmp/diff_new_pack.0tspGr/_new 2011-04-28 13:53:47.000000000 +0200
@@ -18,11 +18,11 @@
Name: yast2-qt-pkg
-Version: 2.20.3
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-pkg-2.20.3.tar.bz2
+Source0: yast2-qt-pkg-2.21.2.tar.bz2
Group: System/YaST
License: GPLv2+
BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libxcrypt-devel
++++++ yast2-qt-pkg-2.20.3.tar.bz2 -> yast2-qt-pkg-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/VERSION.cmake new/yast2-qt-pkg-2.21.2/VERSION.cmake
--- old/yast2-qt-pkg-2.20.3/VERSION.cmake 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/VERSION.cmake 2011-04-27 17:06:05.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "20")
-SET(VERSION_PATCH "3")
+SET(VERSION_MINOR "21")
+SET(VERSION_PATCH "2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.2/package/yast2-qt-pkg.changes
--- old/yast2-qt-pkg-2.20.3/package/yast2-qt-pkg.changes 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/package/yast2-qt-pkg.changes 2011-04-27 17:06:05.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Apr 27 17:05:04 CEST 2011 - tgoettlicher(a)suse.de
+
+- Added translation markers for RPM fields (bnc #686502)
+- 2.21.2
+
+-------------------------------------------------------------------
+Wed Apr 27 16:27:50 CEST 2011 - tgoettlicher(a)suse.de
+
+- Enabled menu key to show context menu (bnc #681702)
+- 2.21.1
+
+-------------------------------------------------------------------
Thu Feb 3 15:13:54 CET 2011 - tgoettlicher(a)suse.de
- Fixed dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/src/YQPkgDependenciesView.cc new/yast2-qt-pkg-2.21.2/src/YQPkgDependenciesView.cc
--- old/yast2-qt-pkg-2.20.3/src/YQPkgDependenciesView.cc 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/src/YQPkgDependenciesView.cc 2011-04-27 17:06:05.000000000 +0200
@@ -103,18 +103,15 @@
table(
row( hcell( _( "Version:" ) ) + cell( pkg->edition().asString() ) ) +
- // Intentionally NOT translating the RPM depencency tags:
- // They make only sense to users who have some basic knowledge what they are anyway.
-
- row( "Provides:", pkg->dep( zypp::Dep::PROVIDES ) ) +
- row( "Prerequires:", pkg->dep( zypp::Dep::PREREQUIRES ) ) +
- row( "Requires:", pkg->dep( zypp::Dep::REQUIRES ) ) +
- row( "Conflicts:", pkg->dep( zypp::Dep::CONFLICTS ) ) +
- row( "Obsoletes:", pkg->dep( zypp::Dep::OBSOLETES ) ) +
- row( "Recommends:", pkg->dep( zypp::Dep::RECOMMENDS ) ) +
- row( "Suggests:", pkg->dep( zypp::Dep::SUGGESTS ) ) +
- row( "Enances:", pkg->dep( zypp::Dep::ENHANCES ) ) +
- row( "Supplements:", pkg->dep( zypp::Dep::SUPPLEMENTS ) )
+ row( _("Provides:"), pkg->dep( zypp::Dep::PROVIDES ) ) +
+ row( _("Prerequires:"), pkg->dep( zypp::Dep::PREREQUIRES ) ) +
+ row( _("Requires:"), pkg->dep( zypp::Dep::REQUIRES ) ) +
+ row( _("Conflicts:"), pkg->dep( zypp::Dep::CONFLICTS ) ) +
+ row( _("Obsoletes:"), pkg->dep( zypp::Dep::OBSOLETES ) ) +
+ row( _("Recommends:"), pkg->dep( zypp::Dep::RECOMMENDS ) ) +
+ row( _("Suggests:"), pkg->dep( zypp::Dep::SUGGESTS ) ) +
+ row( _("Enances:"), pkg->dep( zypp::Dep::ENHANCES ) ) +
+ row( _("Supplements:"), pkg->dep( zypp::Dep::SUPPLEMENTS ) )
);
return html;
@@ -136,15 +133,15 @@
row( hcell( _( "Version:" ) ) + cell( p1->edition().asString() ) + cell( p2->edition().asString() ) ) +
- row( "Provides:", p1->dep( zypp::Dep::PROVIDES ), p2->dep( zypp::Dep::PROVIDES ) ) +
- row( "Prerequires:", p1->dep( zypp::Dep::PREREQUIRES ), p2->dep( zypp::Dep::PREREQUIRES ) ) +
- row( "Requires:", p1->dep( zypp::Dep::REQUIRES ), p2->dep( zypp::Dep::REQUIRES ) ) +
- row( "Conflicts:", p1->dep( zypp::Dep::CONFLICTS ), p2->dep( zypp::Dep::CONFLICTS ) ) +
- row( "Obsoletes:", p1->dep( zypp::Dep::OBSOLETES ), p2->dep( zypp::Dep::OBSOLETES ) ) +
- row( "Recommends:", p1->dep( zypp::Dep::RECOMMENDS ), p2->dep( zypp::Dep::RECOMMENDS ) ) +
- row( "Suggests:", p1->dep( zypp::Dep::SUGGESTS ), p2->dep( zypp::Dep::SUGGESTS ) ) +
- row( "Enances:", p1->dep( zypp::Dep::ENHANCES ), p2->dep( zypp::Dep::ENHANCES ) ) +
- row( "Supplements:", p1->dep( zypp::Dep::SUPPLEMENTS ), p2->dep( zypp::Dep::SUPPLEMENTS ) )
+ row( _("Provides:"), p1->dep( zypp::Dep::PROVIDES ), p2->dep( zypp::Dep::PROVIDES ) ) +
+ row( _("Prerequires:"), p1->dep( zypp::Dep::PREREQUIRES ), p2->dep( zypp::Dep::PREREQUIRES ) ) +
+ row( _("Requires:"), p1->dep( zypp::Dep::REQUIRES ), p2->dep( zypp::Dep::REQUIRES ) ) +
+ row( _("Conflicts:"), p1->dep( zypp::Dep::CONFLICTS ), p2->dep( zypp::Dep::CONFLICTS ) ) +
+ row( _("Obsoletes:"), p1->dep( zypp::Dep::OBSOLETES ), p2->dep( zypp::Dep::OBSOLETES ) ) +
+ row( _("Recommends:"), p1->dep( zypp::Dep::RECOMMENDS ), p2->dep( zypp::Dep::RECOMMENDS ) ) +
+ row( _("Suggests:"), p1->dep( zypp::Dep::SUGGESTS ), p2->dep( zypp::Dep::SUGGESTS ) ) +
+ row( _("Enances:"), p1->dep( zypp::Dep::ENHANCES ), p2->dep( zypp::Dep::ENHANCES ) ) +
+ row( _("Supplements:"), p1->dep( zypp::Dep::SUPPLEMENTS ), p2->dep( zypp::Dep::SUPPLEMENTS ) )
);
return html;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/src/YQPkgObjList.cc new/yast2-qt-pkg-2.21.2/src/YQPkgObjList.cc
--- old/yast2-qt-pkg-2.20.3/src/YQPkgObjList.cc 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/src/YQPkgObjList.cc 2011-04-27 17:06:05.000000000 +0200
@@ -117,10 +117,18 @@
connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ),
this, SLOT ( currentItemChangedInternal( QTreeWidgetItem * ) ) );
+ connect( this, SIGNAL(customContextMenuRequested(const QPoint &)),
+ this, SLOT (slotCustomContextMenu(const QPoint&)));
+
setIconSize( QSize( 22, 16 ) );
+
+ setContextMenuPolicy(Qt::CustomContextMenu);
+
}
+
+
YQPkgObjList::~YQPkgObjList()
{
if ( _excludedItems )
@@ -182,23 +190,7 @@
item->cycleStatus();
}
}
- else if ( button == Qt::RightButton )
- {
- if ( editable() && item->editable() )
- {
- updateActions( item );
-
- if ( ! item->selectable() )
- return;
-
- QMenu * contextMenu =
- ! item->selectable()->installedEmpty() ?
- installedContextMenu() : notInstalledContextMenu();
-
- if ( contextMenu )
- contextMenu->popup( pos );
- }
- }
+ // context menus are handled in slotCustomContextMenu()
}
}
@@ -1680,6 +1672,26 @@
return ( _excludeMap.find( item ) != _excludeMap.end() );
}
+void YQPkgObjList::slotCustomContextMenu(const QPoint& pos)
+{
+ YQPkgObjListItem * item = dynamic_cast<YQPkgObjListItem *> ( currentItem() );
+
+ if ( item && editable() && item->editable() )
+ {
+ updateActions( item );
+
+ if ( ! item->selectable() )
+ return;
+
+ QMenu * contextMenu =
+ ! item->selectable()->installedEmpty() ?
+ installedContextMenu() : notInstalledContextMenu();
+
+ if ( contextMenu )
+ contextMenu->popup( mapToGlobal (pos) );
+ }
+}
+
QTreeWidgetItem * YQPkgObjList::ExcludedItems::oldParentItem( QTreeWidgetItem * item )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/src/YQPkgObjList.h new/yast2-qt-pkg-2.21.2/src/YQPkgObjList.h
--- old/yast2-qt-pkg-2.20.3/src/YQPkgObjList.h 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/src/YQPkgObjList.h 2011-04-27 17:06:05.000000000 +0200
@@ -285,6 +285,12 @@
**/
virtual void currentItemChangedInternal( QTreeWidgetItem * item );
+ /**
+ * slot that shows context menu when requested
+ **/
+ void slotCustomContextMenu(const QPoint& pos);
+
+
signals:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.20.3/src/YQPkgSearchFilterView.cc new/yast2-qt-pkg-2.21.2/src/YQPkgSearchFilterView.cc
--- old/yast2-qt-pkg-2.20.3/src/YQPkgSearchFilterView.cc 2011-02-03 15:16:10.000000000 +0100
+++ new/yast2-qt-pkg-2.21.2/src/YQPkgSearchFilterView.cc 2011-04-27 17:06:05.000000000 +0200
@@ -119,10 +119,9 @@
vLayout->addStretch();
- // Intentionally NOT marking RPM tags for translation
- _searchInProvides = new QCheckBox( "RPM \"P&rovides\"" , gbox ); YUI_CHECK_NEW( _searchInProvides );
+ _searchInProvides = new QCheckBox( _( "RPM \"P&rovides\""), gbox ); YUI_CHECK_NEW( _searchInProvides );
vLayout->addWidget(_searchInProvides);
- _searchInRequires = new QCheckBox( "RPM \"Re&quires\"" , gbox ); YUI_CHECK_NEW( _searchInRequires );
+ _searchInRequires = new QCheckBox( _( "RPM \"Re&quires\""), gbox ); YUI_CHECK_NEW( _searchInRequires );
vLayout->addWidget(_searchInRequires);
_searchInFileList = new QCheckBox( _( "File list" ), gbox ); YUI_CHECK_NEW( _searchInFileList );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org