remove SWAP, reorganize, add ToggleClock script

.gitignore

@@ -0,0 +1,2 @@
+AutoHotkey Script/airdisplayAutoLauncher.exe
+ToggleClock Script/ToggleClock.exe

ColumnCenter.inc

@@ -74,17 +74,6 @@ FontColor=0,0,0
 X=400
 Y=414
 
-[MeterDate]
-Meter=String
-MeasureName=MeasureDate
-MeterStyle=MainTextStyle
-StringAlign=Center
-ClipString=2
-X=640
-Y=435
-W=300
-H=30
-
 [FullClockBackground]
 Meter=Image
 SolidColor=0,0,0

ColumnLeft.inc

@@ -43,15 +43,15 @@ Y=5R
 [MeterCPUGraph]
 Meter=Line
 LineCount=4
-MeasureName=MeasureCPU1Usage
-MeasureName2=MeasureCPU2Usage
-MeasureName3=MeasureCPU3Usage
-MeasureName4=MeasureCPU4Usage
+MeasureName=MeasureCPU4Usage
+MeasureName2=MeasureCPU3Usage
+MeasureName3=MeasureCPU2Usage
+MeasureName4=MeasureCPU1Usage
 MeterStyle=GraphDimension
-LineColor=#CPU1LineColor#
-LineColor2=#CPU2LineColor#
-LineColor3=#CPU3LineColor#
-LineColor4=#CPU4LineColor#
+LineColor=#CPU4LineColor#
+LineColor2=#CPU3LineColor#
+LineColor3=#CPU2LineColor#
+LineColor4=#CPU1LineColor#
 X=0r
 Y=0r
 
@@ -210,31 +210,6 @@ MeterStyle=MainTextStyle
 X=280
 Y=0r
 
-[SWAPIcon]
-Meter=Image
-ImageName=#@#Images\Icons\hdd.png
-X=10
-Y=0R
-
-[MeterSWAPUsage]
-Meter=String
-MeasureName=MeasureSWAPUsage
-MeasureName2=MeasureSWAPTotal
-Autoscale=1
-Text="%1 / %2 GB"
-MeterStyle=MainTextStyle
-X=5R
-Y=0r
-
-[MeterSWAPUsagePercent]
-Meter=String
-MeasureName=MeasureSWAPUsage
-Percentual=1
-Text="%1 %"
-MeterStyle=MainTextStyle
-X=280
-Y=0r
-
 ; graph (need to be separated because not the same scale)
 [RAMGraphBackground]
 Meter=Image
@@ -250,14 +225,6 @@ LineColor=#RAMLineColor#
 X=0r
 Y=0r
 
-[MeterSWAPGraph]
-Meter=Line
-MeasureName=MeasureSWAPUsage
-MeterStyle=GraphDimension
-LineColor=#SWAPLineColor#
-X=0r
-Y=0r
-
 ; bars
 [RAMBarBackground]
 Meter=Image
@@ -273,20 +240,6 @@ BarColor=#RAMBarColor#
 X=0r
 Y=0r
 
-[SWAPBarBackground]
-Meter=Image
-MeterStyle=BarDimension | BarBackgroundStyle
-X=5R
-Y=0r
-
-[MeterSWAPBar]
-Meter=Bar
-MeasureName=MeasureSWAPUsage
-MeterStyle=BarDimension
-BarColor=#SWAPBarColor#
-X=0r
-Y=0r
-
 
 ; ----------------------------------
 ; GPU DISPLAY
@@ -363,12 +316,27 @@ Y=0r
 Meter=Image
 ImageName=#@#Images\Icons\time.png
 X=10
-Y=25R
+Y=15R
 
 [MeterUptime]
 Meter=String
 MeasureName=MeasureUptime
-Text="%1"
 MeterStyle=MainTextStyle
 X=5R
 Y=0r
+
+[CalendarIcon]
+Meter=Image
+ImageName=#@#Images\Icons\calendar.png
+X=10
+Y=10R
+
+[MeterDate]
+Meter=String
+MeasureName=MeasureDate
+MeterStyle=MainTextStyle
+ClipString=2
+X=5R
+Y=0r
+W=275
+H=30

ColumnRight.inc

@@ -102,24 +102,6 @@ MeterStyle=MainTextStyle | RightTextStyle
 X=790
 Y=5r
 
-;[MeterDownloadTotal]
-;Meter=String
-;MeasureName=MeasureDownloadTotal
-;Text="%1B"
-;Autoscale=1
-;MeterStyle=MainTextStyle | RightTextStyle
-;X=545
-;Y=5R
-
-;[MeterUploadTotal]
-;Meter=String
-;MeasureName=MeasureUploadTotal
-;Text="%1B"
-;Autoscale=1
-;MeterStyle=MainTextStyle
-;X=565
-;Y=0r
-
 
 ; ----------------------------------
 ; TOP PROCESSES DISPLAY
@@ -128,7 +110,7 @@ Y=5r
 [TopIcon]
 Meter=Image
 ImageName=#@#Images\Icons\top.png
-X=545
+X=540
 Y=15R
 
 [TopCPUValue1]
@@ -177,7 +159,7 @@ MeasureName=MeasureTopMemValue1
 AutoScale=1
 Text="%1B"
 MeterStyle=MainTextStyle | SmallTextStyle | RightTextStyle
-X=660
+X=655
 Y=-25r
 H=30
 
@@ -222,7 +204,7 @@ Meter=String
 Text=#Drive1#
 MeterStyle=MainTextStyle
 X=410
-Y=15R
+Y=20R
 
 [Drive1BarBackground]
 Meter=Image
@@ -338,22 +320,13 @@ Y=5r
 ; WEATHER DISPLAY
 ; ----------------------------------
 
-;[MeterWeatherLocation]
-;Meter=String
-;MeasureName=MeasureWeatherCity
-;MeasureName2=MeasureWeatherCountry
-;Text="%1, %2"
-;MeterStyle=MainTextStyle
-;X=530
-;Y=350
-
 [MeterWeatherImage]
 Meter=Image
 MeasureName=MeasureWeatherIcon
 DynamicVariables=1
 ImageName=#@#Images\Weather#WeatherTheme#\%1.png
 X=530
-Y=340
+Y=25R
 W=90
 H=90
 LeftMouseUpAction=[!SetVariable WeatherTheme (1-#WeatherTheme#)][!WriteKeyValue Variables WeatherTheme (1-#WeatherTheme#) "Variables.inc"]
@@ -372,8 +345,8 @@ Meter=String
 MeasureName=MeasureWeatherDesc
 Text="%1"
 MeterStyle=MainTextStyle
-ClipString=2
+ClipString=1
 X=0r
 Y=0R
 W=145
-H=30
+H=60

GalaxyS.ini

@@ -36,13 +36,11 @@ CPU3LineColor=#Yellow#
 CPU4BarColor=#Red#,200
 CPU4LineColor=#Red#
 
-RAMBarColor=#Blue#,200
-RAMLineColor=#Blue#
-SWAPBarColor=#Green#,200
-SWAPLineColor=#Green#
+RAMBarColor=#Yellow#,200
+RAMLineColor=#Yellow#
 
-GPUBarColor=#Yellow#,200
-GPULineColor=#Yellow#
+GPUBarColor=#Red#,200
+GPULineColor=#Red#
 
 DownloadBarColor=#Blue#,200
 DownloadLineColor=#DarkBlue#

Measures.inc

@@ -54,16 +54,6 @@ Measure=PhysicalMemory
 Substitute=" G":""
 Total=1
 
-; SWAP
-[MeasureSWAPUsage]
-Measure=SWAPMemory
-Substitute=" G":""
-
-[MeasureSWAPTotal]
-Measure=SWAPMemory
-Substitute=" G":""
-Total=1
-
 
 ; ----------------------------------
 ; GPU MEASURES
@@ -190,14 +180,6 @@ Measure=NetIn
 [MeasureUpload]
 Measure=NetOut
 
-;[MeasureDownloadTotal]
-;Measure=NetIn
-;Cumulative=1
-
-;[MeasureUploadTotal]
-;Measure=NetOut
-;Cumulative=1
-
 
 ; ----------------------------------
 ; HDD MEASURES
@@ -274,20 +256,6 @@ UpdateRate=600
 Url=http://api.openweathermap.org/data/2.5/weather?q=#WeatherQ#&lang=#WeatherLang#&mode=xml&units=metric&appid=#WeatherApiKey#
 RegExp=(?siU)<city.*name="(.*)">.*<country>(.*)</country>.*<temperature value="(.*)".*<weather.*value="(.*)" icon="(.*)"></weather>
 
-;[MeasureWeatherCity]
-;Measure=Plugin
-;Plugin=WebParser
-;Url=[MeasureWeather]
-;StringIndex=1
-;Substitute="":"N/A"
-
-;[MeasureWeatherCountry]
-;Measure=Plugin
-;Plugin=WebParser
-;Url=[MeasureWeather]
-;StringIndex=2
-;Substitute="":"N/A"
-
 [MeasureWeatherTemp]
 Measure=Plugin
 Plugin=WebParser

README.md

@@ -11,28 +11,25 @@ Special skin to be displayed on a Galaxy S connected with AirDisplay (or any 800
  * CPU clock + temperature + load
  * Quad core load graphic
  * RAM size + load
- * SWAP size + load
- * Combined RAM + SWAP load graphic
+ * ~~SWAP size + load~~ (removed because useless on recent machines)
+ * RAM load graphic
  * GPU clock + temperature + load
  * GPU load graphic
  * Uptime
+ * Date
  * External IP
  * Ping
  * Download bandwidth graphic
  * Upload bandwidth graphic
- * ~~Total downloaded and uploaded~~ (falsy because AirDisplay bandwidth usage)
+ * ~~Total downloaded and uploaded~~ (removed because of AirDisplay bandwidth usage)
  * Top processes by CPU and RAM usage
  * 3 drives usage graphic + free space
- * Weather with temperature + icon
- * Date
+ * Weather with temperature + icon (require registration on [OpenWeatherMap](http://openweathermap.org))
  * Volume
  * Clock
 
 ## Requirements
 
  * Rainmeter 3.2
  * Open Hardware Monitor
-
-
-Weather icons from https://www.iconfinder.com/iconsets/bubbly-weather and http://rainmeter.deviantart.com/art/LG-G3-Widget-469857939.  
-Weather reports from http://www.openweathermap.org.
+

ToggleClock Script/README.md

@@ -0,0 +1,3 @@
+This small batch script is used to toggle the "fullscreen" clock of the skin (also available by clicking on the clock).
+
+You can make it an invisible executable with [Bat To Exe Converter](http://www.f2ko.de/en/b2e.php).

ToggleClock Script/ToggleClock.bat

@@ -0,0 +1 @@
+"C:\Program Files\Rainmeter\Rainmeter.exe" !ToggleMeterGroup FullClock GalaxyS

Variables.inc

@@ -16,7 +16,7 @@ WeatherQ=Lyon,fr
 WeatherLang=fr
 
 ; API key for http://openweathermap.org
-WeatherApiKey=
+WeatherApiKey=316c550395f164daeb1de82845c3ad98
 
 ; Weather icons theme (0=white, 1=colorful)
 ; You can also click on the weather icon to change the theme