Ticket #6106: scrolldiff.2.out

File scrolldiff.2.out, 4.7 KB (added by avdongen@…, 17 years ago)

re-submit patch, now for this fix only.

Line 
1Index: programs/mythlcdserver/lcdprocclient.cpp
2===================================================================
3--- programs/mythlcdserver/lcdprocclient.cpp (revision 19631)
4+++ programs/mythlcdserver/lcdprocclient.cpp (working copy)
5@@ -30,7 +30,6 @@
6 #define LCD_TIME_TIME 5000
7 #define LCD_SCROLLLIST_TIME 2000
8
9-int lcdStartCol = LCD_START_COL;
10
11 LCDProcClient::LCDProcClient(LCDServer *lparent) :
12 QObject(NULL, "LCDProcClient")
13@@ -56,11 +55,6 @@
14 cellWidth = 1;
15 cellHeight = 1;
16 lcdStartCol = LCD_START_COL;
17- if (lcdWidth < 12)
18- if (lcdHeight == 1)
19- lcdStartCol = 0;
20- else
21- lcdStartCol = 1;
22
23 hostname = "";
24 port = 13666;
25@@ -622,7 +616,18 @@
26 if (x < 1 || x > 80)
27 return;
28 else
29+ {
30 lcdWidth = x;
31+ if (lcdWidth < 12)
32+ {
33+ if (lcdHeight == 1)
34+ lcdStartCol = 0;
35+ else
36+ lcdStartCol = 1;
37+ }
38+ else
39+ lcdStartCol = LCD_START_COL;
40+ }
41 }
42
43 void LCDProcClient::setHeight(unsigned int x)
44@@ -1193,7 +1198,7 @@
45
46 // Write out the app name
47 if (lcdHeight > 1)
48- outputCenteredText("Menu", app_name, "topWidget", 1);
49+ outputCenteredText("Menu", app_name, "topWidget", 1);
50
51 QPtrListIterator<LCDMenuItem> it(*menuItems);
52 LCDMenuItem *curItem;
53@@ -1278,9 +1283,9 @@
54 {
55 switch (curItem->isChecked())
56 {
57- case CHECKED: aString += "X "; break;
58- case UNCHECKED: aString += "O "; break;
59- case NOTCHECKABLE: aString += " "; break;
60+ case CHECKED: aString += "X"; break;
61+ case UNCHECKED: aString += "O"; break;
62+ case NOTCHECKABLE: break;
63 default: break;
64 }
65 }
66@@ -1347,13 +1352,26 @@
67 else
68 aString += " ";
69
70- switch (curItem->isChecked())
71+ if (lcdStartCol == 1) // small display -> don't waste space for additional spaces
72 {
73- case CHECKED: aString += "X "; break;
74- case UNCHECKED: aString += "O "; break;
75- case NOTCHECKABLE: aString += " "; break;
76- default: break;
77+ switch (curItem->isChecked())
78+ {
79+ case CHECKED: aString += "X"; break;
80+ case UNCHECKED: aString += "O"; break;
81+ case NOTCHECKABLE: aString += ""; break;
82+ default: break;
83+ }
84 }
85+ else if (lcdStartCol != 0)
86+ {
87+ switch (curItem->isChecked())
88+ {
89+ case CHECKED: aString += "X "; break;
90+ case UNCHECKED: aString += "O "; break;
91+ case NOTCHECKABLE: aString += " "; break;
92+ default: break;
93+ }
94+ }
95
96 aString += curItem->ItemName().left(lcdWidth - lcdStartCol) + "\"";
97 sendToServer(aString);
98@@ -1470,26 +1488,26 @@
99
100 if (lcdHeight == 2)
101 {
102- aString = "widget_set Menu menuWidget1 1 2 \">";
103+ aString = "widget_set Menu menuWidget1 1 2 \">";
104 }
105 else
106 {
107 aString = "widget_set Menu menuWidget1 1 1 \"";
108 }
109
110- if (lcdWidth < 12)
111+ if (lcdStartCol == 1) // small display -> don't waste space for additional spaces
112 {
113- switch(curItem->isChecked())
114+ switch (curItem->isChecked())
115 {
116 case CHECKED: aString += "X"; break;
117 case UNCHECKED: aString += "O"; break;
118- case NOTCHECKABLE: aString += ""; break;
119+ case NOTCHECKABLE: break;
120 default: break;
121 }
122 }
123- else
124+ else if (lcdStartCol != 0)
125 {
126- switch(curItem->isChecked())
127+ switch (curItem->isChecked())
128 {
129 case CHECKED: aString += "X "; break;
130 case UNCHECKED: aString += "O "; break;
131Index: programs/mythlcdserver/lcdprocclient.h
132===================================================================
133--- programs/mythlcdserver/lcdprocclient.h (revision 19631)
134+++ programs/mythlcdserver/lcdprocclient.h (working copy)
135@@ -161,6 +161,7 @@
136 unsigned int lcdHeight;
137 unsigned int cellWidth;
138 unsigned int cellHeight;
139+ unsigned int lcdStartCol;
140
141 QString serverVersion;
142 QString protocolVersion;