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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/scriptengines/google_gadgets
From:       Tiger Dong <idlecat511 () gmail ! com>
Date:       2008-12-01 12:09:53
Message-ID: 1228133393.490365.31769.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 891147 by tdong:

[GGL] api cleanup, use enum instead of a lot of bool in functions' params


 M  +1 -1      ggl_package.cpp  
 M  +9 -6      panel_decorator.cpp  
 M  +1 -0      panel_decorator.h  
 M  +5 -3      plasma_host.cpp  
 M  +5 -3      plasma_view_host.cpp  
 M  +4 -5      plasma_view_host_internal.h  


--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/ggl_package.cpp \
#891146:891147 @@ -43,7 +43,7 @@
 class GadgetBrowserViewHost : public qt::QtViewHost {
  public:
   GadgetBrowserViewHost(GglPackage *package, Type type)
-      : QtViewHost(type, 1.0, true, false, true, 0, NULL),
+      : QtViewHost(type, 1.0, FLAG_RECORD_STATES, 0, NULL),
         package_(package) {}
 
   virtual void CloseView() {
--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/panel_decorator.cpp \
#891146:891147 @@ -90,10 +90,10 @@
     if (!owner_->IsMinimizedCaptionVisible()) {
       minimized_width_ = owner_->GetWidth();
       owner_->SetWidth(38);
-      owner_->SetResizeBorderVisible(false, false, false, false);
+      owner_->SetResizeBorderVisible(0);
     } else {
       owner_->SetWidth(minimized_width_);
-      owner_->SetResizeBorderVisible(false, false, false, true);
+      owner_->SetResizeBorderVisible(BORDER_RIGHT);
     }
   }
 
@@ -137,6 +137,10 @@
   }
 }
 
+void PanelDecorator::SetResizable(ViewInterface::ResizableMode resizable) {
+  View::SetResizable(RESIZABLE_FALSE);
+}
+
 /*void PanelDecorator::GetClientExtents(double *width, double *height) const {
   MainViewDecoratorBase::GetClientExtents(width, height);
   if (IsMinimized()) {
@@ -169,8 +173,7 @@
     SetMinimized(true);
   }
 
-  bool border = !IsMinimized();
-  SetResizeBorderVisible(false, false, border, false);
+  SetResizeBorderVisible(IsMinimized() ? 0 : BORDER_BOTTOM);
   d->vertical_ = true;
 }
 
@@ -187,8 +190,8 @@
     SetMinimized(false);
   }
 
-  bool border = !IsMinimized() || IsMinimizedCaptionVisible();
-  SetResizeBorderVisible(false, false, false, border);
+  SetResizeBorderVisible((!IsMinimized() || IsMinimizedCaptionVisible()) ?
+                         0 : BORDER_RIGHT);
   d->vertical_ = false;
 }
 
--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/panel_decorator.h \
#891146:891147 @@ -29,6 +29,7 @@
   virtual ~PanelDecorator();
   virtual void OnAddDecoratorMenuItems(MenuInterface *menu);
   virtual void SetSize(double width, double height);
+  virtual void SetResizable(ViewInterface::ResizableMode resizable);
   void setVertical();
   void setHorizontal();
 
--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/plasma_host.cpp \
#891146:891147 @@ -28,6 +28,7 @@
 #include <ggadget/details_view_decorator.h>
 #include <ggadget/permissions.h>
 #include <ggadget/qt/utilities.h>
+#include <ggadget/qt/qt_view_host.h>
 #include <ggadget/gadget.h>
 
 #include <Plasma/Applet>
@@ -81,8 +82,9 @@
     ViewInterface *child = info->main_view_host->GetView();
     ASSERT(child);
     if (child) {
-      PlasmaViewHost *vh =
-          new PlasmaViewHost(info, ViewHostInterface::VIEW_HOST_MAIN, true);
+      ggadget::qt::QtViewHost *vh =
+          new ggadget::qt::QtViewHost(
+              ViewHostInterface::VIEW_HOST_MAIN, 1.0, 0, 0, NULL);
       PopOutMainViewDecorator *view_decorator =
           new PopOutMainViewDecorator(vh);
       DecoratedViewHost *dvh = new DecoratedViewHost(view_decorator);
@@ -172,7 +174,7 @@
     }
     return d->info->main_view_host;
   } else if (type == ViewHostInterface::VIEW_HOST_OPTIONS) {
-    ViewHostInterface* vh =  new PlasmaViewHost(d->info, type);
+    ViewHostInterface* vh =  new QtViewHost(type, 1.0, 0, 0, NULL);
     d->info->options_view_host = vh;
     return vh;
   } else {
--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/plasma_view_host.cpp \
#891146:891147 @@ -45,7 +45,8 @@
     info->applet->moveBy(x, y);
 }
 
-void PlasmaViewHost::Private::onGeometryChanged(int dleft, int dtop, int dw, int dh) \
{ +void PlasmaViewHost::Private::onGeometryChanged(int dleft, int dtop,
+                                                int dw, int dh) {
   kDebug() << info->applet->geometry();
   info->applet->moveBy(dleft, dtop);
 }
@@ -71,7 +72,7 @@
 }
 
 void PlasmaViewHost::SetView(ViewInterface *view) {
-  DLOG("SetView: %p, %p", this, view);
+  kDebug() << "PlasmaViewHost::SetView:" << this << "," << view;
   if (d->view_ == view) return;
   d->detach();
   d->view_ = view;
@@ -171,7 +172,8 @@
                            view->GetCaption().c_str());
 }
 
-ggadget::ViewHostInterface::ConfirmResponse PlasmaViewHost::Confirm(const \
ViewInterface *view, const char *message, bool) { +ViewHostInterface::ConfirmResponse \
PlasmaViewHost::Confirm( +    const ViewInterface *view, const char *message, bool) {
   int ret = KMessageBox::questionYesNo(NULL,
                                        message,
                                        view->GetCaption().c_str() );
--- trunk/KDE/kdebase/workspace/plasma/scriptengines/google_gadgets/plasma_view_host_internal.h \
#891146:891147 @@ -72,8 +72,7 @@
     if (widget_) return true;
 
     if (type_ == ViewHostInterface::VIEW_HOST_OPTIONS) {
-      // Create a Widget (composite, decorated, movable, input_mask)
-      widget_ = new QtViewWidget(view_, false, true, true, false);
+      widget_ = new QtViewWidget(view_, QtViewWidget::FLAG_WM_DECORATED);
       QVBoxLayout *layout = new QVBoxLayout();
       widget_->setFixedSize(D2I(view_->GetWidth()), D2I(view_->GetHeight()));
       layout->addWidget(widget_);
@@ -110,8 +109,7 @@
     } else if (type_ == ViewHostInterface::VIEW_HOST_MAIN && !is_popout_) {
       // normal main view
       if (info->widget == NULL) {
-        // Create a Widget (composite, decorated, movable, input_mask)
-        widget_ = new QtViewWidget(view_, false, true, false, false);
+        widget_ = new QtViewWidget(view_, 0);
         embedWidget(info->applet, widget_);
         info->widget = widget_;
       } else {
@@ -135,7 +133,7 @@
         view_->SetHeight(info->applet->size().height());
     } else {
       // Popouted main view and details view
-      widget_ = new QtViewWidget(view_, false, false, true, false);
+      widget_ = new QtViewWidget(view_, QtViewWidget::FLAG_MOVABLE);
       parent_widget_ = widget_;
       SetGadgetWindowIcon(widget_, view_->GetGadget());
       if (info->expanded_main_view_host
@@ -214,6 +212,7 @@
 
   bool showContextMenu(int button) {
     ASSERT(view_);
+    Q_UNUSED(button);
     context_menu_.clear();
     QtMenu qt_menu(&context_menu_);
     view_->OnAddContextMenuItems(&qt_menu);


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