← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock/oneiric-201110111206

« back to all changes in this revision

Viewing changes to src/gldit/cairo-dock-internal-background.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2010-09-07 20:31:25 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907203125-tkq6wc8rw0flx5se
Tags: 2.2.0~0rc1-0ubuntu1
https://launchpad.net/bugs/632055
https://launchpad.net/bugs/618336
https://launchpad.net/bugs/614686
https://launchpad.net/bugs/612617
https://launchpad.net/bugs/612355
https://launchpad.net/bugs/611733
* New Upstream Version (LP: #632055)
* Fixed a few bugs on LP:
 - LP: #618336 all button tips visible if icons 'maximum zoom' set to 1.0
 - LP: #614686 create new sud-dock icon that looking like flat
 - LP: #612617 Add custom launchers or sub-docks, can't modify name.
 - LP: #612355 Add option in config file to set GL/Cairo mode            
 - LP: #611733 icon labels go off-screen
* Fixed a crash when changing theme or gauges
* Updated translations

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gldit/cairo-dock-internal-background.c
93
93
                pBackground->fStripesAngle = cairo_dock_get_double_key_value (pKeyFile, "Background", "stripes angle", &bFlushConfFileNeeded, 90., NULL, NULL);
94
94
        }
95
95
        
96
 
        /**
97
 
        // zone de rappel.
98
 
        pBackground->cVisibleZoneImageFile = cairo_dock_get_string_key_value (pKeyFile, "Background", "callback image", &bFlushConfFileNeeded, NULL, "Hidden dock", "callback image");
99
 
        pBackground->fVisibleZoneAlpha = cairo_dock_get_double_key_value (pKeyFile, "Background", "callback alpha", &bFlushConfFileNeeded, 0.5, "Hidden dock", "alpha");
100
 
        pBackground->bReverseVisibleImage = cairo_dock_get_boolean_key_value (pKeyFile, "Background", "callback reverse", &bFlushConfFileNeeded, TRUE, "Hidden dock", "reverse visible image");*/
101
 
        
102
 
        /**
103
 
        // mouvements.
104
 
        int iMovementType;
105
 
        if (! g_key_file_has_key (pKeyFile, "Background", "move bg", NULL))  // anciennes valeurs.
106
 
        {
107
 
                pBackground->fDecorationSpeed = g_key_file_get_double (pKeyFile, "System", "scroll speed factor", NULL);
108
 
                if (pBackground->fDecorationSpeed != 0)
109
 
                {
110
 
                        if (g_key_file_get_boolean (pKeyFile, "System", "decorations enslaved", NULL))
111
 
                                iMovementType = 2;
112
 
                        else
113
 
                                iMovementType = 1;
114
 
                        g_key_file_set_double (pKeyFile, "Background", "decorations speed", pBackground->fDecorationSpeed);
115
 
                }
116
 
                else
117
 
                        iMovementType = 0;
118
 
                g_key_file_set_integer (pKeyFile, "Background", "move bg", iMovementType);
119
 
                bFlushConfFileNeeded = TRUE;
120
 
        }
121
 
        iMovementType = cairo_dock_get_integer_key_value (pKeyFile, "Background", "move bg", &bFlushConfFileNeeded, 0, NULL, NULL);
122
 
        if (iMovementType != 0)
123
 
        {
124
 
                pBackground->fDecorationSpeed = cairo_dock_get_double_key_value (pKeyFile, "Background", "decorations speed", &bFlushConfFileNeeded, 0.5, NULL, NULL);
125
 
                pBackground->bDecorationsFollowMouse = (iMovementType == 2);
126
 
        }*/
127
 
        
128
96
        return bFlushConfFileNeeded;
129
97
}
130
98