remove
2007-06-29 Jens Granseuer <jensgr@gmx.net> * display-capplet.png: remove * Makefile.am: * display-properties.desktop.in.in: * icons/16x16/gnome-display-properties.png: * icons/22x22/gnome-display-properties.png: * icons/24x24/gnome-display-properties.png: * icons/32x32/gnome-display-properties.png: * icons/scalable/gnome-display-properties.svg: * main.c: (create_dialog): add and use new icon by Jakub Steiner <jimmac@ximian.com>. Closes bug #375230. svn path=/trunk/; revision=7806
This commit is contained in:
Jens Granseuer
Jens Granseuer
parent
68c38dbe66
commit
729cecafc0
10 changed files with 558 additions and 66 deletions
|
|
@ -1,3 +1,17 @@
|
|||
2007-06-29 Jens Granseuer <jensgr@gmx.net>
|
||||
|
||||
* display-capplet.png: remove
|
||||
|
||||
* Makefile.am:
|
||||
* display-properties.desktop.in.in:
|
||||
* icons/16x16/gnome-display-properties.png:
|
||||
* icons/22x22/gnome-display-properties.png:
|
||||
* icons/24x24/gnome-display-properties.png:
|
||||
* icons/32x32/gnome-display-properties.png:
|
||||
* icons/scalable/gnome-display-properties.svg:
|
||||
* main.c: (create_dialog): add and use new icon by Jakub Steiner
|
||||
<jimmac@ximian.com>. Closes bug #375230.
|
||||
|
||||
2007-06-26 Michael Terry <mike@mterry.name>
|
||||
|
||||
* Makefile.am, main.c, display-properties.desktop.in.in: Use
|
||||
|
|
|
|||
|
|
@ -3,23 +3,32 @@ cappletname = display
|
|||
|
||||
bin_PROGRAMS = gnome-display-properties
|
||||
|
||||
gnome_display_properties_LDADD = $(DISPLAY_CAPPLET_LIBS) $(top_builddir)/capplets/common/libcommon.la
|
||||
gnome_display_properties_SOURCES = \
|
||||
main.c
|
||||
gnome_display_properties_SOURCES = main.c
|
||||
gnome_display_properties_LDFLAGS = -export-dynamic
|
||||
gnome_display_properties_LDADD = \
|
||||
$(DISPLAY_CAPPLET_LIBS) \
|
||||
$(top_builddir)/capplets/common/libcommon.la
|
||||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
icondir = $(datadir)/icons/hicolor/48x48/apps
|
||||
dist_icon_DATA = display-capplet.png
|
||||
icons16dir = $(datadir)/icons/hicolor/16x16/apps
|
||||
dist_icons16_DATA = icons/16x16/gnome-display-properties.png
|
||||
icons22dir = $(datadir)/icons/hicolor/22x22/apps
|
||||
dist_icons22_DATA = icons/22x22/gnome-display-properties.png
|
||||
icons24dir = $(datadir)/icons/hicolor/24x24/apps
|
||||
dist_icons24_DATA = icons/24x24/gnome-display-properties.png
|
||||
icons32dir = $(datadir)/icons/hicolor/32x32/apps
|
||||
dist_icons32_DATA = icons/32x32/gnome-display-properties.png
|
||||
iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
|
||||
dist_iconssvg_DATA = icons/scalable/gnome-display-properties.svg
|
||||
|
||||
desktopdir = $(datadir)/applications
|
||||
Desktop_in_files = display-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
|
||||
INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
|
||||
$(GNOMECC_CAPPLETS_CFLAGS) \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DGLADEDIR="\"$(gladedir)\"" \
|
||||
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
|
||||
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
|
||||
|
||||
|
|
@ -36,4 +45,3 @@ update-icon-cache:
|
|||
echo "*** Icon cache not updated. After (un)install, run this:"; \
|
||||
echo "*** $(gtk_update_icon_cache)"; \
|
||||
fi
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Screen Resolution
|
||||
_Comment=Change screen resolution
|
||||
Exec=gnome-display-properties
|
||||
Icon=display-capplet
|
||||
Icon=gnome-display-properties
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
BIN
capplets/display/icons/16x16/gnome-display-properties.png
Normal file
BIN
capplets/display/icons/16x16/gnome-display-properties.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 613 B |
BIN
capplets/display/icons/22x22/gnome-display-properties.png
Normal file
BIN
capplets/display/icons/22x22/gnome-display-properties.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 866 B |
BIN
capplets/display/icons/24x24/gnome-display-properties.png
Normal file
BIN
capplets/display/icons/24x24/gnome-display-properties.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 909 B |
BIN
capplets/display/icons/32x32/gnome-display-properties.png
Normal file
BIN
capplets/display/icons/32x32/gnome-display-properties.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
470
capplets/display/icons/scalable/gnome-display-properties.svg
Normal file
470
capplets/display/icons/scalable/gnome-display-properties.svg
Normal file
|
|
@ -0,0 +1,470 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://web.resource.org/cc/"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="48.000000px"
|
||||
height="48.000000px"
|
||||
id="svg3304"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.44+devel"
|
||||
sodipodi:docbase="/home/jimmac/gfx/ximian/art/icons/control-center/scalable"
|
||||
sodipodi:docname="change-resolution.svg"
|
||||
inkscape:output_extension="org.inkscape.output.svg.inkscape"
|
||||
sodipodi:modified="true">
|
||||
<defs
|
||||
id="defs3306">
|
||||
<linearGradient
|
||||
id="linearGradient2804">
|
||||
<stop
|
||||
style="stop-color:black;stop-opacity:0;"
|
||||
offset="0"
|
||||
id="stop2806" />
|
||||
<stop
|
||||
id="stop2812"
|
||||
offset="0.5"
|
||||
style="stop-color:black;stop-opacity:1;" />
|
||||
<stop
|
||||
style="stop-color:black;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop2808" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2804"
|
||||
id="linearGradient2831"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="21.875"
|
||||
y1="48.000977"
|
||||
x2="21.875"
|
||||
y2="40" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2781"
|
||||
id="radialGradient2829"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(2,0,0,0.8,36,8.8)"
|
||||
cx="1"
|
||||
cy="44"
|
||||
fx="1"
|
||||
fy="44"
|
||||
r="5" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient2781">
|
||||
<stop
|
||||
style="stop-color:black;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2783" />
|
||||
<stop
|
||||
style="stop-color:black;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop2785" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2781"
|
||||
id="radialGradient2827"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
|
||||
cx="1"
|
||||
cy="44"
|
||||
fx="1"
|
||||
fy="44"
|
||||
r="5" />
|
||||
<linearGradient
|
||||
id="linearGradient5137">
|
||||
<stop
|
||||
style="stop-color:#eeeeec;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop5139" />
|
||||
<stop
|
||||
style="stop-color:#e6e6e3;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop5141" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient6240">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop6242" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop6244" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient11400">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop11402" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop11404" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient11400"
|
||||
id="linearGradient11406"
|
||||
x1="23.154902"
|
||||
y1="34.572548"
|
||||
x2="23.529411"
|
||||
y2="40.219608"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(0,0.7954955)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient5137"
|
||||
id="linearGradient5147"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="17.247635"
|
||||
y1="6.3760414"
|
||||
x2="39.904388"
|
||||
y2="38.876041"
|
||||
gradientTransform="translate(0,0.7954955)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient5137"
|
||||
id="linearGradient5223"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="31.743324"
|
||||
y1="37.842293"
|
||||
x2="31.86105"
|
||||
y2="43.82579"
|
||||
gradientTransform="translate(0,0.7954955)" />
|
||||
<linearGradient
|
||||
id="linearGradient7025"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop7027"
|
||||
offset="0"
|
||||
style="stop-color:#e6ce46;stop-opacity:1" />
|
||||
<stop
|
||||
id="stop7029"
|
||||
offset="1"
|
||||
style="stop-color:#d6ba1c;stop-opacity:1" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient22122"
|
||||
inkscape:collect="always">
|
||||
<stop
|
||||
id="stop22124"
|
||||
offset="0"
|
||||
style="stop-color:black;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop22126"
|
||||
offset="1"
|
||||
style="stop-color:black;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient22140">
|
||||
<stop
|
||||
id="stop22142"
|
||||
offset="0"
|
||||
style="stop-color:black;stop-opacity:0;" />
|
||||
<stop
|
||||
style="stop-color:black;stop-opacity:1;"
|
||||
offset="0.5"
|
||||
id="stop22148" />
|
||||
<stop
|
||||
id="stop22144"
|
||||
offset="1"
|
||||
style="stop-color:black;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient22122"
|
||||
id="radialGradient4770"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0,-1.000001,1.142856,0,-41.10259,45.50001)"
|
||||
cx="7"
|
||||
cy="39.464806"
|
||||
fx="7"
|
||||
fy="39.464806"
|
||||
r="3.5" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient22122"
|
||||
id="radialGradient4772"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0,-1.000001,1.142856,0,-89.10259,-31.49999)"
|
||||
cx="7"
|
||||
cy="39.464806"
|
||||
fx="7"
|
||||
fy="39.464806"
|
||||
r="3.5" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient22140"
|
||||
id="linearGradient4774"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="18.142136"
|
||||
y1="35"
|
||||
x2="18.142136"
|
||||
y2="42.040661" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient7025"
|
||||
id="linearGradient4776"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(53,1.428571)"
|
||||
x1="13.630114"
|
||||
y1="28.5"
|
||||
x2="25.208096"
|
||||
y2="41.180992" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient6240"
|
||||
id="linearGradient4778"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(7.843e-3,0.7954955)"
|
||||
x1="20.156862"
|
||||
y1="5.0996137"
|
||||
x2="20.156862"
|
||||
y2="26.039215" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#849193"
|
||||
borderopacity="1.0000000"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1"
|
||||
inkscape:cx="39.697787"
|
||||
inkscape:cy="26.598514"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:grid-bbox="true"
|
||||
inkscape:document-units="px"
|
||||
inkscape:showpageshadow="false"
|
||||
showborder="true"
|
||||
inkscape:window-width="923"
|
||||
inkscape:window-height="937"
|
||||
inkscape:window-x="2004"
|
||||
inkscape:window-y="169"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:grid-points="true" />
|
||||
<metadata
|
||||
id="metadata3309">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>Change Resolution</dc:title>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Jakub Steiner</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
<cc:license
|
||||
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
|
||||
<dc:subject>
|
||||
<rdf:Bag>
|
||||
<rdf:li>display</rdf:li>
|
||||
<rdf:li>resolution</rdf:li>
|
||||
<rdf:li>video</rdf:li>
|
||||
</rdf:Bag>
|
||||
</dc:subject>
|
||||
<dc:contributor>
|
||||
<cc:Agent>
|
||||
<dc:title>Andreas Nilsson
|
||||
Luca Ferretti <elle.uca@libero.it></dc:title>
|
||||
</cc:Agent>
|
||||
</dc:contributor>
|
||||
<dc:date></dc:date>
|
||||
<dc:source>http://www.gnome.org</dc:source>
|
||||
</cc:Work>
|
||||
<cc:License
|
||||
rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
|
||||
<cc:permits
|
||||
rdf:resource="http://web.resource.org/cc/Reproduction" />
|
||||
<cc:permits
|
||||
rdf:resource="http://web.resource.org/cc/Distribution" />
|
||||
<cc:requires
|
||||
rdf:resource="http://web.resource.org/cc/Notice" />
|
||||
<cc:permits
|
||||
rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
|
||||
<cc:requires
|
||||
rdf:resource="http://web.resource.org/cc/ShareAlike" />
|
||||
<cc:requires
|
||||
rdf:resource="http://web.resource.org/cc/SourceCode" />
|
||||
</cc:License>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer">
|
||||
<g
|
||||
id="g2822"
|
||||
style="opacity:0.3"
|
||||
transform="matrix(0.9308511,0,0,1.037397,1.6941489,-1.795056)">
|
||||
<rect
|
||||
transform="scale(-1,-1)"
|
||||
y="-48"
|
||||
x="-11"
|
||||
height="8"
|
||||
width="10"
|
||||
id="rect1892"
|
||||
style="opacity:1;color:#000000;fill:url(#radialGradient2827);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
||||
<rect
|
||||
y="40"
|
||||
x="38"
|
||||
height="8"
|
||||
width="10"
|
||||
id="rect2789"
|
||||
style="opacity:1;color:#000000;fill:url(#radialGradient2829);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
||||
<rect
|
||||
y="40"
|
||||
x="11"
|
||||
height="8"
|
||||
width="27"
|
||||
id="rect2793"
|
||||
style="opacity:1;color:#000000;fill:url(#linearGradient2831);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
||||
</g>
|
||||
<rect
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="rect4784"
|
||||
width="48"
|
||||
height="48"
|
||||
x="0"
|
||||
y="0.79549509" />
|
||||
<path
|
||||
style="opacity:1;color:#000000;fill:url(#linearGradient5223);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
||||
d="M 14.375479,36.328843 C 14.375479,36.328843 15.592355,41.263443 10.51915,41.309767 C 8.0888743,41.331672 8.5866723,45.344918 8.5866723,45.344918 L 39.433139,45.313545 C 39.433139,45.313545 39.851577,41.418182 37.410922,41.372513 C 32.423455,41.280374 33.600393,36.266098 33.600393,36.266098 L 14.375479,36.328843 z "
|
||||
id="path9222"
|
||||
sodipodi:nodetypes="csccscc" />
|
||||
<path
|
||||
style="fill:url(#linearGradient5147);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
|
||||
d="M 4.8886262,4.2739318 L 43.01746,4.2739318 C 45.042579,4.2739318 46.518438,5.7015863 46.518438,7.9000726 L 46.529388,34.103908 C 46.529388,35.795975 46.001041,36.319137 44.494732,36.319137 L 3.5320635,36.300202 C 2.3527922,36.271409 1.513468,35.805541 1.4976345,34.280899 L 1.5128113,7.7123281 C 1.5128113,5.9385022 3.0522187,4.2739318 4.8886262,4.2739318 z "
|
||||
id="rect5040"
|
||||
sodipodi:nodetypes="ccccccccc" />
|
||||
<rect
|
||||
style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="rect9208"
|
||||
width="37.00032"
|
||||
height="22.996691"
|
||||
x="5.5059438"
|
||||
y="8.2973185" />
|
||||
<path
|
||||
sodipodi:type="inkscape:offset"
|
||||
inkscape:radius="-0.875"
|
||||
inkscape:original="M 4.875 4.28125 C 3.0385925 4.28125 1.5 5.9449242 1.5 7.71875 L 1.5 34.28125 C 1.5158335 35.805892 2.3519787 36.283708 3.53125 36.3125 L 44.5 36.3125 C 46.006309 36.3125 46.53125 35.785816 46.53125 34.09375 L 46.53125 7.90625 C 46.53125 5.7077637 45.056369 4.2812498 43.03125 4.28125 L 4.875 4.28125 z "
|
||||
xlink:href="#rect5040"
|
||||
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
|
||||
id="path5145"
|
||||
inkscape:href="#rect5040"
|
||||
d="M 4.875,5.0625 C 3.5670573,5.0625 2.375,6.3571498 2.375,7.625 L 2.375,34.1875 C 2.3812657,34.79084 2.515801,34.970853 2.65625,35.09375 C 2.796699,35.216647 3.0858905,35.332113 3.5625,35.34375 L 44.5,35.34375 C 45.151173,35.34375 45.356981,35.24273 45.4375,35.15625 C 45.518019,35.06977 45.65625,34.755549 45.65625,34 L 45.65625,7.8125 C 45.65625,6.0053499 44.645463,5.0624999 43.03125,5.0625 L 4.875,5.0625 z " />
|
||||
<path
|
||||
style="opacity:0.6;fill:url(#linearGradient11406);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 13.992156,36.834708 C 14.075817,39.007257 13.708803,39.746151 12.358532,40.509939 L 35.973934,41.807257 C 35.024915,40.638629 33.644523,38.873923 34.020993,36.819022 L 13.992156,36.834708 z "
|
||||
id="path10672"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
<path
|
||||
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8f;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.43902438"
|
||||
d="M 9.9921262,42.291555 C 16.698819,42.293524 37.78891,42.291555 37.78891,42.291555"
|
||||
id="path6575"
|
||||
sodipodi:nodetypes="cc" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path8029"
|
||||
d="M 9.647928,43.299429 C 16.354621,43.301398 38.367789,43.299429 38.367789,43.299429"
|
||||
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
style="opacity:0.4;fill:url(#linearGradient4778);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 6.031372,8.8268676 L 6.031372,26.834708 C 22.475817,25.480459 28.630065,16.722289 41.999999,15.807256 L 42,8.7954956 L 6.031372,8.8268676 z "
|
||||
id="path4073"
|
||||
sodipodi:nodetypes="ccccc" />
|
||||
<g
|
||||
id="g4754"
|
||||
transform="translate(-46.77135,-7.3370294)">
|
||||
<g
|
||||
transform="matrix(0.916667,0,0,0.714282,49.771334,11.132681)"
|
||||
style="opacity:0.3"
|
||||
id="g22150">
|
||||
<rect
|
||||
style="opacity:1;fill:url(#radialGradient4770);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1"
|
||||
id="rect22120"
|
||||
width="4"
|
||||
height="7"
|
||||
x="0"
|
||||
y="35" />
|
||||
<rect
|
||||
style="opacity:1;fill:url(#radialGradient4772);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1"
|
||||
id="rect22134"
|
||||
width="4"
|
||||
height="7"
|
||||
x="-48"
|
||||
y="-42"
|
||||
transform="scale(-1,-1)" />
|
||||
<rect
|
||||
style="opacity:1;fill:url(#linearGradient4774);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1"
|
||||
id="rect22138"
|
||||
width="40"
|
||||
height="7"
|
||||
x="4"
|
||||
y="35" />
|
||||
</g>
|
||||
<g
|
||||
id="g4743">
|
||||
<g
|
||||
id="g10824"
|
||||
transform="translate(-5.228666,-6.29601)">
|
||||
<path
|
||||
id="path4319"
|
||||
d="M 57.5,14.928571 L 57.5,44.928571 L 96.5,44.928571 L 57.5,14.928571 z M 63.5,27.928571 L 78.5,38.928571 L 63.5,38.928571 L 63.5,27.928571 z "
|
||||
style="fill:url(#linearGradient4776);fill-opacity:1;fill-rule:evenodd;stroke:#a38503;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4326"
|
||||
d="M 61.5,44.928571 L 61.5,41.928571"
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a38503;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4328"
|
||||
d="M 67.5,44.928571 L 67.5,41.928571"
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a38503;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4330"
|
||||
d="M 73.5,44.928571 L 73.5,41.964285"
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a38503;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4332"
|
||||
d="M 79.5,44.928571 L 79.5,41.928571"
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a38503;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:nodetypes="cc"
|
||||
id="path4334"
|
||||
d="M 85.5,44.928571 L 85.5,41.928571"
|
||||
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a38503;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
<path
|
||||
id="path6126"
|
||||
d="M 58.500002,16.928575 L 58.500002,43.928586 L 93.500014,43.928586 L 58.500002,16.928575 z "
|
||||
style="opacity:0.4;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
|
||||
</g>
|
||||
<path
|
||||
style="opacity:0.4;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="M 9.5017474,38.542446 L 9.4575532,24.532894 L 28.541592,38.563262 L 9.5017474,38.542446 z "
|
||||
id="path12221"
|
||||
sodipodi:nodetypes="cccc"
|
||||
transform="translate(47.771334,-4.867439)" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 19 KiB |
|
|
@ -50,18 +50,18 @@ struct ScreenInfo
|
|||
int current_height;
|
||||
SizeID current_size;
|
||||
short current_rate;
|
||||
|
||||
|
||||
Rotation current_rotation;
|
||||
Rotation old_rotation;
|
||||
Rotation rotations;
|
||||
|
||||
SizeID old_size;
|
||||
short old_rate;
|
||||
|
||||
|
||||
XRRScreenConfiguration *config;
|
||||
XRRScreenSize *sizes;
|
||||
int n_sizes;
|
||||
|
||||
|
||||
GtkWidget *resolution_widget;
|
||||
GtkWidget *rate_widget;
|
||||
GtkWidget *rotate_widget;
|
||||
|
|
@ -95,7 +95,7 @@ read_display_info (GdkDisplay *display)
|
|||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
screen = gdk_display_get_screen (display, i);
|
||||
|
||||
|
||||
screen_info = &info->screens[i];
|
||||
screen_info->current_width = gdk_screen_get_width (screen);
|
||||
screen_info->current_height = gdk_screen_get_height (screen);
|
||||
|
|
@ -103,7 +103,7 @@ read_display_info (GdkDisplay *display)
|
|||
root_window = gdk_screen_get_root_window (screen);
|
||||
screen_info->config = XRRGetScreenInfo (gdk_x11_display_get_xdisplay (display),
|
||||
gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)));
|
||||
|
||||
|
||||
screen_info->current_rate = XRRConfigCurrentRate (screen_info->config);
|
||||
screen_info->current_size = XRRConfigCurrentConfiguration (screen_info->config, &screen_info->current_rotation);
|
||||
screen_info->sizes = XRRConfigSizes (screen_info->config, &screen_info->n_sizes);
|
||||
|
|
@ -122,17 +122,17 @@ update_display_info (struct DisplayInfo *info, GdkDisplay *display)
|
|||
int i;
|
||||
|
||||
g_assert (info->n_screens == gdk_display_get_n_screens (display));
|
||||
|
||||
|
||||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
screen = gdk_display_get_screen (display, i);
|
||||
|
||||
|
||||
screen_info = &info->screens[i];
|
||||
|
||||
screen_info->old_rate = screen_info->current_rate;
|
||||
screen_info->old_size = screen_info->current_size;
|
||||
screen_info->old_rotation = screen_info->current_rotation;
|
||||
|
||||
|
||||
screen_info->current_width = gdk_screen_get_width (screen);
|
||||
screen_info->current_height = gdk_screen_get_height (screen);
|
||||
|
||||
|
|
@ -221,13 +221,13 @@ apply_config (struct DisplayInfo *info)
|
|||
new_res = get_current_resolution (screen_info);
|
||||
new_rate = get_current_rate (screen_info);
|
||||
new_rot = get_current_rotation (screen_info);
|
||||
|
||||
|
||||
if (new_res != screen_info->current_size ||
|
||||
new_rate != screen_info->current_rate ||
|
||||
new_rot != screen_info->current_rotation)
|
||||
{
|
||||
changed = TRUE;
|
||||
status = XRRSetScreenConfigAndRate (xdisplay,
|
||||
changed = TRUE;
|
||||
status = XRRSetScreenConfigAndRate (xdisplay,
|
||||
screen_info->config,
|
||||
gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
|
||||
new_res,
|
||||
|
|
@ -238,7 +238,7 @@ apply_config (struct DisplayInfo *info)
|
|||
}
|
||||
|
||||
update_display_info (info, display);
|
||||
|
||||
|
||||
if (changed) {
|
||||
gchar *cmd;
|
||||
|
||||
|
|
@ -265,7 +265,7 @@ revert_config (struct DisplayInfo *info)
|
|||
|
||||
display = gdk_display_get_default ();
|
||||
xdisplay = gdk_x11_display_get_xdisplay (display);
|
||||
|
||||
|
||||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
struct ScreenInfo *screen_info = &info->screens[i];
|
||||
|
|
@ -275,14 +275,14 @@ revert_config (struct DisplayInfo *info)
|
|||
screen = gdk_display_get_screen (display, i);
|
||||
root_window = gdk_screen_get_root_window (screen);
|
||||
|
||||
status = XRRSetScreenConfigAndRate (xdisplay,
|
||||
status = XRRSetScreenConfigAndRate (xdisplay,
|
||||
screen_info->config,
|
||||
gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
|
||||
screen_info->old_size,
|
||||
screen_info->old_rotation,
|
||||
screen_info->old_rate > 0 ? screen_info->old_rate : 0,
|
||||
GDK_CURRENT_TIME);
|
||||
|
||||
|
||||
}
|
||||
|
||||
update_display_info (info, display);
|
||||
|
|
@ -291,7 +291,7 @@ revert_config (struct DisplayInfo *info)
|
|||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
struct ScreenInfo *screen_info = &info->screens[i];
|
||||
|
||||
|
||||
generate_resolution_menu (screen_info);
|
||||
generate_rate_menu (screen_info);
|
||||
}
|
||||
|
|
@ -341,7 +341,7 @@ wrap_in_label (GtkWidget *child, char *text)
|
|||
TRUE, TRUE, 0);
|
||||
|
||||
gtk_widget_show (hbox);
|
||||
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (vbox),
|
||||
hbox,
|
||||
FALSE, FALSE, 0);
|
||||
|
|
@ -375,12 +375,12 @@ generate_rate_menu (struct ScreenInfo *screen_info)
|
|||
int size_nr;
|
||||
char *str;
|
||||
int closest_rate_nr;
|
||||
|
||||
|
||||
store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
|
||||
gtk_combo_box_set_model (GTK_COMBO_BOX (screen_info->rate_widget), GTK_TREE_MODEL (store));
|
||||
|
||||
size_nr = get_current_resolution (screen_info);
|
||||
|
||||
|
||||
closest_rate_nr = -1;
|
||||
rates = XRRConfigRates (screen_info->config, size_nr, &nrates);
|
||||
for (i = 0; i < nrates; i++)
|
||||
|
|
@ -448,11 +448,11 @@ generate_resolution_menu(struct ScreenInfo* screen_info)
|
|||
item++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
gtk_combo_box_set_active (combo, current_item);
|
||||
|
||||
g_signal_connect (screen_info->resolution_widget, "changed", G_CALLBACK (resolution_changed_callback), screen_info);
|
||||
|
||||
|
||||
gtk_widget_show (screen_info->resolution_widget);
|
||||
g_object_unref (store);
|
||||
}
|
||||
|
|
@ -530,7 +530,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
|
||||
gtk_table_set_row_spacings ( GTK_TABLE (table), 6);
|
||||
gtk_table_set_col_spacings ( GTK_TABLE (table), 12);
|
||||
|
||||
|
||||
label = gtk_label_new_with_mnemonic (_("_Resolution:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_widget_show (label);
|
||||
|
|
@ -549,7 +549,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
0, 1,
|
||||
GTK_FILL | GTK_EXPAND, 0,
|
||||
0, 0);
|
||||
|
||||
|
||||
label = gtk_label_new_with_mnemonic (_("Re_fresh rate:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_widget_show (label);
|
||||
|
|
@ -560,7 +560,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
GTK_FILL, 0,
|
||||
0, 0);
|
||||
gtk_widget_show (table);
|
||||
|
||||
|
||||
option_menu = create_rate_menu (screen_info);
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
|
||||
gtk_table_attach (GTK_TABLE (table),
|
||||
|
|
@ -569,7 +569,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
1, 2,
|
||||
GTK_FILL | GTK_EXPAND, 0,
|
||||
0, 0);
|
||||
|
||||
|
||||
label = gtk_label_new_with_mnemonic (_("R_otation:"));
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
gtk_widget_show (label);
|
||||
|
|
@ -579,7 +579,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
2, 3,
|
||||
GTK_FILL, 0,
|
||||
0, 0);
|
||||
|
||||
|
||||
option_menu = create_rotate_menu (screen_info);
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
|
||||
gtk_table_attach (GTK_TABLE (table),
|
||||
|
|
@ -588,7 +588,7 @@ create_screen_widgets (struct ScreenInfo *screen_info, int nr, gboolean no_heade
|
|||
2, 3,
|
||||
GTK_FILL | GTK_EXPAND, 0,
|
||||
0, 0);
|
||||
|
||||
|
||||
if (nr == 0)
|
||||
str = g_strdup (_("Default Settings"));
|
||||
else
|
||||
|
|
@ -617,7 +617,7 @@ create_dialog (struct DisplayInfo *info)
|
|||
#else
|
||||
char hostname[256];
|
||||
#endif
|
||||
|
||||
|
||||
dialog = gtk_dialog_new_with_buttons (_("Screen Resolution Preferences"),
|
||||
NULL,
|
||||
GTK_DIALOG_NO_SEPARATOR,
|
||||
|
|
@ -628,18 +628,18 @@ create_dialog (struct DisplayInfo *info)
|
|||
"gtk-help",
|
||||
GTK_RESPONSE_HELP,
|
||||
NULL);
|
||||
|
||||
|
||||
gtk_window_set_resizable(GTK_WINDOW (dialog), FALSE);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
|
||||
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
|
||||
capplet_set_icon (dialog, "display-capplet");
|
||||
|
||||
capplet_set_icon (dialog, "gnome-display-properties");
|
||||
|
||||
vbox = gtk_vbox_new (FALSE, 18);
|
||||
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
|
||||
vbox, FALSE, FALSE, 0);
|
||||
gtk_widget_show (vbox);
|
||||
|
||||
|
||||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
screen_widget = create_screen_widgets (&info->screens[i], i, info->n_screens == 1);
|
||||
|
|
@ -654,7 +654,7 @@ create_dialog (struct DisplayInfo *info)
|
|||
strcmp (hostname, "localhost") != 0 &&
|
||||
strcmp (hostname, "localhost.localdomain") != 0)
|
||||
{
|
||||
|
||||
|
||||
str = g_strdup_printf (_("_Make default for this computer (%s) only"), hostname);
|
||||
per_computer_check = gtk_check_button_new_with_mnemonic (str);
|
||||
|
||||
|
|
@ -668,12 +668,12 @@ create_dialog (struct DisplayInfo *info)
|
|||
|
||||
info->was_per_computer = resolution != NULL;
|
||||
g_free (resolution);
|
||||
|
||||
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (per_computer_check),
|
||||
info->was_per_computer);
|
||||
|
||||
|
||||
gtk_widget_show (per_computer_check);
|
||||
|
||||
|
||||
wrapped = wrap_in_label (per_computer_check, _("Options"));
|
||||
gtk_box_pack_start (GTK_BOX (vbox),
|
||||
wrapped, FALSE, FALSE, 0);
|
||||
|
|
@ -681,7 +681,7 @@ create_dialog (struct DisplayInfo *info)
|
|||
}
|
||||
|
||||
info->per_computer_check = per_computer_check;
|
||||
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
||||
|
|
@ -703,7 +703,7 @@ save_timeout_callback (gpointer _data)
|
|||
{
|
||||
struct TimeoutData *data = _data;
|
||||
char *str;
|
||||
|
||||
|
||||
data->time--;
|
||||
|
||||
if (data->time == 0)
|
||||
|
|
@ -716,7 +716,7 @@ save_timeout_callback (gpointer _data)
|
|||
str = timeout_string (data->time);
|
||||
gtk_label_set_text (data->label, str);
|
||||
g_free (str);
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -740,14 +740,14 @@ run_revert_dialog (struct DisplayInfo *info)
|
|||
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
|
||||
gtk_window_set_title (GTK_WINDOW (dialog), _("Keep Resolution"));
|
||||
gtk_window_set_position(GTK_WINDOW(dialog),GTK_WIN_POS_CENTER_ALWAYS);
|
||||
|
||||
|
||||
label = gtk_label_new (NULL);
|
||||
str = g_strdup_printf ("<b>%s</b>", _("Do you want to keep this resolution?"));
|
||||
gtk_label_set_markup (GTK_LABEL (label), str);
|
||||
g_free (str);
|
||||
image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
|
||||
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
|
||||
|
||||
|
||||
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
|
||||
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
|
||||
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
|
||||
|
|
@ -768,14 +768,14 @@ run_revert_dialog (struct DisplayInfo *info)
|
|||
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
|
||||
gtk_dialog_add_buttons (GTK_DIALOG (dialog),_("Use _previous resolution"), GTK_RESPONSE_NO, _("_Keep resolution"), GTK_RESPONSE_YES, NULL);
|
||||
|
||||
|
||||
gtk_widget_show_all (hbox);
|
||||
|
||||
timeout_data.time = REVERT_COUNT;
|
||||
timeout_data.label = GTK_LABEL (label_sec);
|
||||
timeout_data.dialog = GTK_DIALOG (dialog);
|
||||
timeout_data.timed_out = FALSE;
|
||||
|
||||
|
||||
timeout = g_timeout_add (1000, save_timeout_callback, &timeout_data);
|
||||
res = gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
|
||||
|
|
@ -783,7 +783,7 @@ run_revert_dialog (struct DisplayInfo *info)
|
|||
g_source_remove (timeout);
|
||||
|
||||
gtk_widget_destroy (dialog);
|
||||
|
||||
|
||||
return res == GTK_RESPONSE_YES;
|
||||
}
|
||||
|
||||
|
|
@ -801,7 +801,7 @@ save_to_gconf (struct DisplayInfo *info, gboolean save_computer, gboolean clear_
|
|||
int i;
|
||||
|
||||
gethostname (hostname, sizeof(hostname));
|
||||
|
||||
|
||||
client = gconf_client_get_default ();
|
||||
|
||||
if (clear_computer)
|
||||
|
|
@ -818,7 +818,7 @@ save_to_gconf (struct DisplayInfo *info, gboolean save_computer, gboolean clear_
|
|||
g_free (key);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (save_computer)
|
||||
{
|
||||
path = g_strconcat ("/desktop/gnome/screen/",
|
||||
|
|
@ -828,7 +828,7 @@ save_to_gconf (struct DisplayInfo *info, gboolean save_computer, gboolean clear_
|
|||
}
|
||||
else
|
||||
path = g_strdup ("/desktop/gnome/screen/default/");
|
||||
|
||||
|
||||
for (i = 0; i < info->n_screens; i++)
|
||||
{
|
||||
struct ScreenInfo *screen_info = &info->screens[i];
|
||||
|
|
@ -841,11 +841,11 @@ save_to_gconf (struct DisplayInfo *info, gboolean save_computer, gboolean clear_
|
|||
str = g_strdup_printf ("%dx%d",
|
||||
screen_info->sizes[new_res].width,
|
||||
screen_info->sizes[new_res].height);
|
||||
|
||||
|
||||
res = gconf_client_set_string (client, key, str, NULL);
|
||||
g_free (str);
|
||||
g_free (key);
|
||||
|
||||
|
||||
key = g_strdup_printf ("%s%d/rate", path, i);
|
||||
res = gconf_client_set_int (client, key, new_rate, NULL);
|
||||
g_free (key);
|
||||
|
|
@ -870,7 +870,7 @@ cb_dialog_response (GtkDialog *dialog, gint response_id, struct DisplayInfo *inf
|
|||
case GTK_RESPONSE_APPLY:
|
||||
save_computer = info->per_computer_check != NULL && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (info->per_computer_check));
|
||||
clear_computer = !save_computer && info->was_per_computer;
|
||||
|
||||
|
||||
if (apply_config (info))
|
||||
{
|
||||
gtk_widget_hide(GTK_WIDGET(dialog));
|
||||
|
|
@ -881,7 +881,7 @@ cb_dialog_response (GtkDialog *dialog, gint response_id, struct DisplayInfo *inf
|
|||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
save_to_gconf (info, save_computer, clear_computer);
|
||||
gtk_main_quit ();
|
||||
break;
|
||||
|
|
@ -900,7 +900,7 @@ main (int argc, char *argv[])
|
|||
GtkWidget *dialog;
|
||||
struct DisplayInfo *info;
|
||||
Display *xdisplay;
|
||||
|
||||
|
||||
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
|
|
@ -912,11 +912,11 @@ main (int argc, char *argv[])
|
|||
|
||||
display = gdk_display_get_default ();
|
||||
xdisplay = gdk_x11_display_get_xdisplay (display);
|
||||
|
||||
|
||||
if (!XRRQueryExtension (xdisplay, &event_base, &error_base) ||
|
||||
XRRQueryVersion (xdisplay, &major, &minor) == 0)
|
||||
{
|
||||
GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||
GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||
_("The X Server does not support the XRandR extension. Runtime resolution changes to the display size are not available."));
|
||||
gtk_dialog_run (GTK_DIALOG (msg_dialog));
|
||||
gtk_widget_destroy (msg_dialog);
|
||||
|
|
@ -924,13 +924,13 @@ main (int argc, char *argv[])
|
|||
}
|
||||
else if (major != 1 || minor < 1)
|
||||
{
|
||||
GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||
GtkWidget *msg_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
|
||||
_("The version of the XRandR extension is incompatible with this program. Runtime changes to the display size are not available."));
|
||||
gtk_dialog_run (GTK_DIALOG (msg_dialog));
|
||||
gtk_widget_destroy (msg_dialog);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
|
||||
info = read_display_info (display);
|
||||
dialog = create_dialog (info);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue