← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-updates

« back to all changes in this revision

Viewing changes to Dbus/src/interface-applet-methods.c

  • Committer: Kees Cook
  • Date: 2011-08-11 23:17:39 UTC
  • mfrom: (20.1.1 cairo-dock-plug-ins)
  • Revision ID: kees@outflux.net-20110811231739-cteedan51tmdg77v
Tags: 2.4.0~0beta2-0ubuntu1
releasing version 2.4.0~0beta2-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
Dbus/src/interface-applet-methods.c
435
435
                                        gtk_range_set_value (GTK_RANGE (pScale), fInitialValue);
436
436
                                        
437
437
                                        gtk_widget_set (pScale, "width-request", 150, NULL);
 
438
                                        cairo_dock_set_dialog_widget_text_color (pScale);
438
439
                                        
439
440
                                        if (cMinLabel || cMaxLabel)
440
441
                                        {
669
670
                        pIcon->pSubDock = NULL;
670
671
                }
671
672
                pInstance->pDesklet->icons = g_list_concat (pInstance->pDesklet->icons, pIconsList);
672
 
                gpointer data[2] = {GINT_TO_POINTER (TRUE), GINT_TO_POINTER (FALSE)};
673
 
                cairo_dock_set_desklet_renderer_by_name (pInstance->pDesklet, "Caroussel", (CairoDeskletRendererConfigPtr) data);
 
673
                gpointer data[3] = {GINT_TO_POINTER (0), GINT_TO_POINTER (TRUE), NULL};
 
674
                cairo_dock_set_desklet_renderer_by_name (pInstance->pDesklet, "Panel", (CairoDeskletRendererConfigPtr) data);
674
675
        }
675
676
        
676
677
        return TRUE;
844
845
                pRenderAttr->iMemorySize = (pIcon->fWidth > 1 ? pIcon->fWidth : 32);  // fWidht peut etre <= 1 en mode desklet au chargement.
845
846
                // Line;Plain;Bar;Circle;Plain Circle
846
847
                if (cTheme == NULL || strcmp (cTheme, "Line") == 0)
847
 
                        attr.iType = CAIRO_DOCK_GRAPH2_LINE;
 
848
                        attr.iType = CAIRO_DOCK_GRAPH_LINE;
848
849
                else if (strcmp (cTheme, "Plain") == 0)
849
 
                        attr.iType = CAIRO_DOCK_GRAPH2_PLAIN;
 
850
                        attr.iType = CAIRO_DOCK_GRAPH_PLAIN;
850
851
                else if (strcmp (cTheme, "Bar") == 0)
851
 
                        attr.iType = CAIRO_DOCK_GRAPH2_BAR;
 
852
                        attr.iType = CAIRO_DOCK_GRAPH_BAR;
852
853
                else if (strcmp (cTheme, "Circle") == 0)
853
 
                        attr.iType = CAIRO_DOCK_GRAPH2_CIRCLE;
 
854
                        attr.iType = CAIRO_DOCK_GRAPH_CIRCLE;
854
855
                else if (strcmp (cTheme, "Plain Circle") == 0)
855
 
                        attr.iType = CAIRO_DOCK_GRAPH2_CIRCLE_PLAIN;
 
856
                        attr.iType = CAIRO_DOCK_GRAPH_CIRCLE_PLAIN;
856
857
                attr.iRadius = 10;
857
858
                attr.bMixGraphs = FALSE;
858
859
                double *fHighColor = g_new (double, iNbValues*3);
929
930
                if (pIcon->cClass != NULL)
930
931
                        cairo_dock_deinhibite_class (pIcon->cClass, pIcon);
931
932
                if (cClass != NULL)
932
 
                        cairo_dock_inhibite_class (cClass, pIcon);
 
933
                {
 
934
                        cairo_dock_inhibite_class (cClass, pIcon);  /// useful to use cairo_dock_register_class ?...
 
935
                }
933
936
                if (! cairo_dock_is_loading ())
934
937
                {
935
938
                        CairoContainer *pContainer = pInstance->pContainer;
1124
1127
                                        {
1125
1128
                                                image = gtk_image_new_from_stock (cIcon, GTK_ICON_SIZE_MENU);
1126
1129
                                        }
 
1130
#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
 
1131
                                        gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (pMenuItem), TRUE);
 
1132
#endif
1127
1133
                                        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (pMenuItem), image);
1128
1134
                                }
1129
1135
                        }
1268
1274
        }
1269
1275
        else if (strcmp (cProperty, "orientation") == 0)
1270
1276
        {
1271
 
                CairoDockPositionType iScreenBorder = (g_pMainDock ? ((! g_pMainDock->container.bIsHorizontal) << 1) | (! g_pMainDock->container.bDirectionUp) : 0);
 
1277
                CairoDockPositionType iScreenBorder = ((! pContainer->bIsHorizontal) << 1) | (! pContainer->bDirectionUp);
1272
1278
                g_value_init (v, G_TYPE_UINT);
1273
1279
                g_value_set_uint (v, iScreenBorder);
1274
1280
        }