[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/utils/krusader/krusader/Panel
From:       Jan Lepper <dehtris () yahoo ! de>
Date:       2010-03-01 1:01:12
Message-ID: 1267405272.773729.7560.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097367 by janlepper:

new: KrViewInstance::name(), KrView::instance()

 M  +7 -1      krinterbriefview.cpp  
 M  +2 -0      krinterbriefview.h  
 M  +7 -1      krinterdetailedview.cpp  
 M  +2 -0      krinterdetailedview.h  
 M  +2 -0      krview.h  
 M  +3 -2      krviewfactory.cpp  
 M  +5 -1      krviewfactory.h  


--- trunk/extragear/utils/krusader/krusader/Panel/krinterbriefview.cpp \
#1097366:1097367 @@ -81,7 +81,7 @@
 
 // code used to register the view
 #define INTERBRIEFVIEW_ID 1
-KrViewInstance interBriefView(INTERBRIEFVIEW_ID, i18n("&Brief View"), Qt::ALT + \
Qt::SHIFT + Qt::Key_B, +KrViewInstance interBriefView(INTERBRIEFVIEW_ID, \
                "KrInterBriefView", i18n("&Brief View"), Qt::ALT + Qt::SHIFT + \
                Qt::Key_B,
                               KrInterBriefView::create, \
KrInterViewItem::itemHeightChanged);  // end of register code
 
@@ -134,6 +134,12 @@
 //         delete it.next().value();
 //     _itemHash.clear();
 }
+
+KrViewInstance* KrInterBriefView::instance()
+{
+    return &interBriefView;
+}
+
 #if 0
 KrViewItem* KrInterBriefView::findItemByName(const QString &name)
 {
--- trunk/extragear/utils/krusader/krusader/Panel/krinterbriefview.h #1097366:1097367
@@ -38,6 +38,8 @@
 public:
     KrInterBriefView(QWidget *parent, bool &left, KConfig *cfg = krConfig);
     virtual ~KrInterBriefView();
+
+    virtual KrViewInstance *instance();
 /*
     virtual void addItems(vfs* v, bool addUpDir = true);
     virtual KrViewItem* findItemByName(const QString &name);
--- trunk/extragear/utils/krusader/krusader/Panel/krinterdetailedview.cpp \
#1097366:1097367 @@ -77,7 +77,7 @@
 
 // code used to register the view
 #define INTERVIEW_ID 0
-KrViewInstance interDetailedView(INTERVIEW_ID, i18n("&Detailed View"), Qt::ALT + \
Qt::SHIFT + Qt::Key_D, +KrViewInstance interDetailedView(INTERVIEW_ID, \
                "KrInterDetailedView", i18n("&Detailed View"), Qt::ALT + Qt::SHIFT + \
                Qt::Key_D,
                                  KrInterDetailedView::create, \
KrInterViewItem::itemHeightChanged);  // end of register code
 
@@ -136,6 +136,12 @@
 //         delete it.next().value();
 //     _itemHash.clear();
 }
+
+KrViewInstance* KrInterDetailedView::instance()
+{
+    return &interDetailedView;
+}
+
 #if 0
 KrViewItem* KrInterDetailedView::findItemByName(const QString &name)
 {
--- trunk/extragear/utils/krusader/krusader/Panel/krinterdetailedview.h \
#1097366:1097367 @@ -42,6 +42,8 @@
 public:
     KrInterDetailedView(QWidget *parent, bool &left, KConfig *cfg = krConfig);
     virtual ~KrInterDetailedView();
+
+    virtual KrViewInstance *instance();
 /*
     virtual void addItems(vfs* v, bool addUpDir = true);
     virtual KrViewItem* findItemByName(const QString &name);
--- trunk/extragear/utils/krusader/krusader/Panel/krview.h #1097366:1097367
@@ -51,6 +51,7 @@
 class KrQuickSearch;
 class KrPreviews;
 class QModelIndex;
+class KrViewInstance;
 typedef QList<KrViewItem*> KrViewItemList;
 
 // KrViewProperties
@@ -231,6 +232,7 @@
     // notes: constructor does as little as possible, setup() does the rest. esp, \
                note that
     // if you need something from operator or properties, move it into setup()
     virtual void init();
+    virtual KrViewInstance *instance() = 0;
 
     static const IconSizes iconSizes;
 
--- trunk/extragear/utils/krusader/krusader/Panel/krviewfactory.cpp #1097366:1097367
@@ -36,8 +36,9 @@
 extern KrViewInstance interDetailedView;    // hold reference for linking
 extern KrViewInstance interBriefView;    // hold reference for linking
 
-KrViewInstance::KrViewInstance(int id, QString desc, QKeySequence shortcut, \
                KrViewFactoryFunction fun, KrViewItemHeightChange fun2) :
-        m_id(id), m_description(desc), m_shortcut(shortcut), m_factoryfun(fun), \
m_ihchangefun(fun2) +KrViewInstance::KrViewInstance(int id, QString name, QString \
desc, QKeySequence shortcut, KrViewFactoryFunction fun, KrViewItemHeightChange fun2) \
: +        m_id(id), m_name(name), m_description(desc), m_shortcut(shortcut), \
m_factoryfun(fun), m_ihchangefun(fun2) +
 {
 }
 
--- trunk/extragear/utils/krusader/krusader/Panel/krviewfactory.h #1097366:1097367
@@ -45,11 +45,14 @@
 class KrViewInstance
 {
 public:
-    KrViewInstance(int id, QString desc, QKeySequence shortcut, \
KrViewFactoryFunction fun, KrViewItemHeightChange fun2); +    KrViewInstance(int id, \
QString name, QString desc, QKeySequence shortcut, KrViewFactoryFunction fun, \
KrViewItemHeightChange fun2);  
     inline int                     id()                    {
         return m_id;
     }
+    inline QString                 name()                  {
+        return m_name;
+    }
     inline QString                 description()           {
         return m_description;
     }
@@ -65,6 +68,7 @@
 
 protected:
     int                            m_id;
+    QString                        m_name;
     QString                        m_description;
     QKeySequence                   m_shortcut;
     KrViewFactoryFunction          m_factoryfun;


[prev in list] [next in list] [prev in thread] [next in thread]