renamed the component back to qt
authorcoolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Wed, 12 Dec 2007 14:09:55 +0000 (14:09 +0000)
committercoolo <coolo@e0cc52ee-31ee-0310-8b87-e83c4596d67c>
Wed, 12 Dec 2007 14:09:55 +0000 (14:09 +0000)
git-svn-id: http://svn.opensuse.org/svn/yast/trunk/qt@43020 e0cc52ee-31ee-0310-8b87-e83c4596d67c

12 files changed:
CMakeLists.txt
RPMNAME
VERSION.cmake
package/yast2-qt.changes [moved from package/yast2-qt4.changes with 93% similarity]
src/CMakeLists.txt
src/Y2CCQt.cc
src/Y2CCQt.h
src/YQDialog.cc
src/YQPackageSelectorPlugin.cc
src/YQUIComponent.h
src/pkg/CMakeLists.txt
yast2-qt.spec.in [moved from yast2-qt4.spec.in with 88% similarity]

index 862413d..82da867 100644 (file)
@@ -1,11 +1,11 @@
-PROJECT(yast2-qt4)
+PROJECT(yast2-qt)
 SET( CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules" ${CMAKE_MODULE_PATH} )
 
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wno-deprecated" )
 SET( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g -Wall" )
 set( CMAKE_CXX_FLAGS_RELEASE   "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG -DNDEBUG")
 
-SET( RPMNAME "yast2-qt4" )
+SET( RPMNAME "yast2-qt" )
 
 FIND_PACKAGE(Qt4 REQUIRED)
 FIND_PACKAGE(Yast REQUIRED)
diff --git a/RPMNAME b/RPMNAME
index f8328e4..b0bfc63 100644 (file)
--- a/RPMNAME
+++ b/RPMNAME
@@ -1 +1 @@
-yast2-qt4
+yast2-qt
index a63d1d7..1cd6738 100644 (file)
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "16")
-SET(VERSION_PATCH "8")
+SET(VERSION_PATCH "9")
similarity index 93%
rename from package/yast2-qt4.changes
rename to package/yast2-qt.changes
index 789743b..a878e18 100644 (file)
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 12 15:04:34 CET 2007 - coolo@suse.de
+
+- merged yast2-qt4 into yast2-qt
+- V 2.16.9
+
 -------------------------------------------------------------------
 Tue Dec 11 16:34:56 CET 2007 - sh@suse.de
 
index 55e47f5..321ea4d 100644 (file)
@@ -10,7 +10,7 @@ ADD_DEFINITIONS(
 -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\"
 )
 
-SET(qt4_yast_plugin_SRCS
+SET(qt_yast_plugin_SRCS
   QY2CharValidator.cc QY2ComboTabWidget.cc QY2DiskUsageList.cc 
   QY2ListView.cc QY2Settings.cc Y2CCQt.cc 
   YFrameBuffer.cc YQAlignment.cc YQApplication.cc YQBarGraph.cc 
@@ -30,26 +30,26 @@ SET(qt4_yast_plugin_SRCS
   YQWizard.cc QY2Styler.cc
 )
 
-QT4_AUTOMOC(${qt4_yast_plugin_SRCS})
+QT4_AUTOMOC(${qt_yast_plugin_SRCS})
 
-QT4_WRAP_UI(qt4_yast_plugin_SRCS QHelpDialog.ui)
+QT4_WRAP_UI(qt_yast_plugin_SRCS QHelpDialog.ui)
 
 INCLUDE_DIRECTORIES( ${QT_INCLUDES} )
 INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui )
 
-ADD_LIBRARY( py2qt4 SHARED ${qt4_yast_plugin_SRCS})
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_YCP_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_PLUGIN_WFM_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${QT_QTCORE_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${QT_QTGUI_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4 ${YAST_PLUGIN_UI_LIBRARY} )
-SET_TARGET_PROPERTIES( py2qt4 PROPERTIES SOVERSION 2 )
+ADD_LIBRARY( py2qt SHARED ${qt_yast_plugin_SRCS})
+TARGET_LINK_LIBRARIES( py2qt ${YAST_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_YCP_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_WFM_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt ${YAST_PLUGIN_UI_LIBRARY} )
+SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 )
 
-INSTALL(TARGETS py2qt4 LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
+INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
 
 ADD_SUBDIRECTORY(pkg)
 
-#SET_TARGET_PROPERTIES( y2lang_qt4 PROPERTIES PREFIX "" )
+#SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" )
 
index 1714834..036dfa8 100644 (file)
@@ -24,6 +24,6 @@
 // the Y2ComponentBroker, so that will be able to find it.
 // This all happens before main() is called!
 
-Y2CCQt g_y2ccqt4;
+Y2CCQt g_y2ccqt;
 
 
index ff9ec50..4aad419 100644 (file)
@@ -51,7 +51,7 @@ public:
      */
     Y2Component *create(const char * name) const
     {
-       if (!strcmp(name, "qt4") )
+       if (!strcmp(name, "qt") )
        {
            Y2Component* ret = YUIComponent::uiComponent ();
            if (!ret || ret->name () != name)
index e7cc370..676b05a 100644 (file)
@@ -24,6 +24,7 @@
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <QDesktopWidget>
+#include <QDebug>
 
 #include "YQUI.h"
 #include "YQi18n.h"
@@ -664,11 +665,14 @@ YQDialog::center( QWidget * dialog, QWidget * parent )
     if ( ! dialog || ! parent )
         return;
 
+    qDebug() << "center" << parent->rect() << dialog->rect();
+
     QPoint pos( ( parent->width()  - dialog->width()  ) / 2,
                 ( parent->height() - dialog->height() ) / 2 );
 
     pos += parent->mapToGlobal( QPoint( 0, 0 ) );
     pos = dialog->mapToParent( dialog->mapFromGlobal( pos ) );
+    qDebug() << pos;
     dialog->move( pos );
 }
 
index 3ae7778..d3f36bf 100644 (file)
@@ -26,7 +26,7 @@
 #include "pkg/YQSimplePatchSelector.h"
 #include "YUIException.h"
 
-#define PLUGIN_BASE_NAME "qt4_pkg"
+#define PLUGIN_BASE_NAME "qt_pkg"
 
 
 YQPackageSelectorPlugin::YQPackageSelectorPlugin()
index f305458..0041b8f 100644 (file)
@@ -47,7 +47,7 @@ public:
      *
      * Reimplemented from YUIComponent.
      **/
-    virtual string name() const { return "qt4"; }
+    virtual string name() const { return "qt"; }
 
 };
 
index 98c8420..758dba1 100644 (file)
@@ -16,22 +16,22 @@ ADD_DEFINITIONS(
 )
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format-nonliteral -fmessage-length=0" )
 
-SET(qt4_yast_pkg_plugin_SRCS YQPackageSelectorBase.cc YQPackageSelector.cc YQPackageSelectorHelp.cc YQPatternSelector.cc YQPkgChangeLogView.cc YQPkgChangesDialog.cc YQPkgConflictDialog.cc YQPkgConflictList.cc YQPkgDependenciesView.cc YQPkgDescriptionDialog.cc YQPkgDescriptionView.cc YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc YQPkgProductDialog.cc YQPkgProductList.cc YQPkgRepoFilterView.cc YQPkgRepoList.cc YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc YQPkgTextDialog.cc YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQSimplePatchSelector.cc QY2LayoutUtils.cc )
+SET(qt_yast_pkg_plugin_SRCS YQPackageSelectorBase.cc YQPackageSelector.cc YQPackageSelectorHelp.cc YQPatternSelector.cc YQPkgChangeLogView.cc YQPkgChangesDialog.cc YQPkgConflictDialog.cc YQPkgConflictList.cc YQPkgDependenciesView.cc YQPkgDescriptionDialog.cc YQPkgDescriptionView.cc YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc YQPkgProductDialog.cc YQPkgProductList.cc YQPkgRepoFilterView.cc YQPkgRepoList.cc YQPkgRpmGroupTagsFilterView.cc YQPkgSearchFilterView.cc YQPkgSelDescriptionView.cc YQPkgSelList.cc YQPkgSelMapper.cc YQPkgStatusFilterView.cc YQPkgTechnicalDetailsView.cc YQPkgTextDialog.cc YQPkgUpdateProblemFilterView.cc YQPkgVersionsView.cc YQSimplePatchSelector.cc QY2LayoutUtils.cc )
 
-QT4_AUTOMOC(${qt4_yast_pkg_plugin_SRCS})
+QT4_AUTOMOC(${qt_yast_pkg_plugin_SRCS})
 
 INCLUDE_DIRECTORIES( ${QT_INCLUDES} )
 INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} )
 INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR}/yui )
 
-ADD_LIBRARY( py2qt4_pkg SHARED ${qt4_yast_pkg_plugin_SRCS})
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${YAST_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${YAST_YCP_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${YAST_PLUGIN_WFM_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${QT_QTCORE_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${QT_QTGUI_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${YAST_PLUGIN_UI_LIBRARY} )
-TARGET_LINK_LIBRARIES( py2qt4_pkg ${ZYPP_LIBRARY} )
-SET_TARGET_PROPERTIES( py2qt4_pkg PROPERTIES SOVERSION 2 )
-
-INSTALL(TARGETS py2qt4_pkg LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
+ADD_LIBRARY( py2qt_pkg SHARED ${qt_yast_pkg_plugin_SRCS})
+TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_YCP_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_PLUGIN_WFM_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTCORE_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${QT_QTGUI_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${YAST_PLUGIN_UI_LIBRARY} )
+TARGET_LINK_LIBRARIES( py2qt_pkg ${ZYPP_LIBRARY} )
+SET_TARGET_PROPERTIES( py2qt_pkg PROPERTIES SOVERSION 2 )
+
+INSTALL(TARGETS py2qt_pkg LIBRARY DESTINATION ${YAST_PLUGIN_DIR} )
similarity index 88%
rename from yast2-qt4.spec.in
rename to yast2-qt.spec.in
index a88ff25..14a2052 100644 (file)
@@ -51,10 +51,10 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr (-, root, root)
-%_libdir/YaST2/plugin/libpy2qt4.so.*
-%_libdir/YaST2/plugin/libpy2qt4.so
-%_libdir/YaST2/plugin/libpy2qt4_pkg.so.*
-%_libdir/YaST2/plugin/libpy2qt4_pkg.so
+%_libdir/YaST2/plugin/libpy2qt.so.*
+%_libdir/YaST2/plugin/libpy2qt.so
+%_libdir/YaST2/plugin/libpy2qt_pkg.so.*
+%_libdir/YaST2/plugin/libpy2qt_pkg.so
 %_prefix/share/YaST2/theme
 
 %changelog