'Re: Review Request: Merge the final and fixed QML battery monitor to master.'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Re: Review Request: Merge the final and fixed QML battery monitor to master.
From:       "Viranch Mehta" <viranch.mehta () gmail ! com>
Date:       2012-03-20 21:45:48
Message-ID: 20120320214548.5898.9651 () vidsolbach ! de
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

> On March 20, 2012, 10:27 a.m., Sebastian Kügler wrote:
> > plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml, line 97
> > <http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line97>
> > 
> > horizontalAlignment: Text.AlignRight

This doesn't work for some reason (the width of the Label item is same as that \
required by the painted text, not the width of the cell it is in).

Instead of that, anchors.right: parent.right is used.

> On March 20, 2012, 10:27 a.m., Sebastian Kügler wrote:
> > plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml, line 81
> > <http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line81>
> > 
> > showRemainingTime?

There is added condition: text!="" && showRemainingTime elsewhere. Hence here is \
simply connected to it.

> On March 20, 2012, 10:27 a.m., Sebastian Kügler wrote:
> > plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml, line 130
> > <http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line130>
> > 
> > sleepButton and hibernateButton should be hidden when the system does not support \
> > it. Looks like this was forgotten here. Did you make sure it works? 
> > It's exposed in the dataengine, in "Sleep States", keys: "Suspend", "Hibernate".
> > 
> > Could be as simple as visible: powermanagmentEngine.data["Sleep \
> > States"]["Suspend"] etc...

Yes it was forgotten, thanks for pointing out. Added the visible condition.

On March 20, 2012, 10:27 a.m., Viranch Mehta wrote:
> > When installing from the plasma/viranch/powermanagementservices branch, I'm \
> > getting this error during installation: 
> > CMake Error at applets/batterymonitor/cmake_install.cmake:56 (FILE):
> > file INSTALL cannot find
> > "/home/sebas/kdesvn/src/kde-workspace/plasma/generic/applets/batterymonitor/battery-oxygen.svgz".
> >  
> > Can you have a look?

Fixed. I'd recommend not to merge it from that branch though, because it also has \
lock_logout QML applet and few other things that might cause a lot of merge \
conflicts. Use the attached diff for merging.

- Viranch

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/104226/#review11650
-----------------------------------------------------------

On March 20, 2012, 9:44 p.m., Viranch Mehta wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/104226/
> -----------------------------------------------------------
> 
> (Updated March 20, 2012, 9:44 p.m.)
> 
> 
> Review request for Plasma.
> 
> 
> Description
> -------
> 
> I fixed the QML battery monitor to be fairly usable and this diff merges it to \
> master. 
> 
> Diffs
> -----
> 
> plasma/generic/applets/CMakeLists.txt 2dedcb2 
> plasma/generic/applets/batterymonitor/CMakeLists.txt PRE-CREATION 
> plasma/generic/applets/batterymonitor/Messages.sh PRE-CREATION 
> plasma/generic/applets/batterymonitor/README.txt PRE-CREATION 
> plasma/generic/applets/batterymonitor/battery-oxygen-inkscape.svgz PRE-CREATION 
> plasma/generic/applets/batterymonitor/battery-oxygen.svgz PRE-CREATION 
> plasma/generic/applets/batterymonitor/contents/config/main.xml PRE-CREATION 
> plasma/generic/applets/batterymonitor/contents/ui/IconButton.qml PRE-CREATION 
> plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml PRE-CREATION 
> plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml PRE-CREATION 
> plasma/generic/applets/batterymonitor/contents/ui/config.ui PRE-CREATION 
> plasma/generic/applets/batterymonitor/metadata.desktop PRE-CREATION 
> plasma/generic/dataengines/powermanagement/powermanagementengine.h 20642c2 
> plasma/generic/dataengines/powermanagement/powermanagementengine.cpp 5572fcb 
> plasma/generic/dataengines/powermanagement/powermanagementjob.h 2c32015 
> plasma/generic/dataengines/powermanagement/powermanagementjob.cpp e205bb0 
> plasma/generic/dataengines/powermanagement/powermanagementservice.operations \
> ad1301f  
> Diff: http://git.reviewboard.kde.org/r/104226/diff/
> 
> 
> Testing
> -------
> 
> Applet and dataengine both tested and work fine.
> 
> 
> Screenshots
> -----------
> 
> 
> http://git.reviewboard.kde.org/r/104226/s/482/
> 
> 
> Thanks,
> 
> Viranch Mehta
> 
> 

[Attachment #5 (text/html)]

<html>
 <body>
  <div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
   <table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;">  <tr>
     <td>
      This is an automatically generated e-mail. To reply, visit:
      <a href="http://git.reviewboard.kde.org/r/104226/">http://git.reviewboard.kde.org/r/104226/</a>
  </td>
    </tr>
   </table>
   <br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On March 20th, 2012, 10:27 a.m., <b>Sebastian \
Kügler</b> wrote:</p>  <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">  

<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;">  <thead>
  <tr>
   <th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;">  <a \
href="http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line81" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml</a>  \
<span style="font-weight: normal;">

     (Diff revision 7)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td>

  </tr>
 </tbody>

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th>  <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>  <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">81</font></th>  <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">            \
visible: timeRemain.visible</pre></td>  </tr>

 </tbody>

</table>

  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">showRemainingTime?</pre> \
</blockquote>

</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">There is \
added condition: text!=&quot;&quot; &amp;&amp; showRemainingTime elsewhere. Hence \
here is simply connected to it.</pre> <br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On March 20th, 2012, 10:27 a.m., <b>Sebastian \
Kügler</b> wrote:</p>  <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">  

<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;">  <thead>
  <tr>
   <th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;">  <a \
href="http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line97" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml</a>  \
<span style="font-weight: normal;">

     (Diff revision 7)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td>

  </tr>
 </tbody>

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th>  <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>  <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">97</font></th>  <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">            \
text: i18nc(&quot;Label for powermanagement inhibition&quot;, &quot;Power management \
enabled:&quot;)</pre></td>  </tr>

 </tbody>

</table>

  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">horizontalAlignment: \
Text.AlignRight</pre>  </blockquote>

</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This \
doesn&#39;t work for some reason (the width of the Label item is same as that \
required by the painted text, not the width of the cell it is in).

Instead of that, anchors.right: parent.right is used.</pre>
<br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On March 20th, 2012, 10:27 a.m., <b>Sebastian \
Kügler</b> wrote:</p>  <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">  

<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;">  <thead>
  <tr>
   <th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;">  <a \
href="http://git.reviewboard.kde.org/r/104226/diff/7/?file=53144#file53144line130" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml</a>  \
<span style="font-weight: normal;">

     (Diff revision 7)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
"></pre></td>

  </tr>
 </tbody>

 <tbody>

  <tr>
    <th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th>  <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>  <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">130</font></th>  <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">            \
onClicked: sleepClicked()</pre></td>  </tr>

 </tbody>

</table>

  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">sleepButton and \
hibernateButton should be hidden when the system does not support it. Looks like this \
was forgotten here. Did you make sure it works?

It&#39;s exposed in the dataengine, in &quot;Sleep States&quot;, keys: \
&quot;Suspend&quot;, &quot;Hibernate&quot;.

Could be as simple as visible: powermanagmentEngine.data[&quot;Sleep \
States&quot;][&quot;Suspend&quot;] etc...</pre>  </blockquote>

</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Yes it was \
forgotten, thanks for pointing out. Added the visible condition.</pre> <br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On March 20th, 2012, 10:27 a.m., <b>Sebastian \
Kügler</b> wrote:</p>  <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">  <pre style="white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">When installing from the plasma/viranch/powermanagementservices branch, \
I&#39;m getting this error during installation:

CMake Error at applets/batterymonitor/cmake_install.cmake:56 (FILE):
  file INSTALL cannot find
  &quot;/home/sebas/kdesvn/src/kde-workspace/plasma/generic/applets/batterymonitor/battery-oxygen.svgz&quot;.

Can you have a look?</pre>
 </blockquote>

</blockquote>

<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Fixed. I&#39;d recommend \
not to merge it from that branch though, because it also has lock_logout QML applet \
and few other things that might cause a lot of merge conflicts. Use the attached diff \
for merging.</pre> <br />

<p>- Viranch</p>

<br />
<p>On March 20th, 2012, 9:44 p.m., Viranch Mehta wrote:</p>

<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;">  <tr>
  <td>

<div>Review request for Plasma.</div>
<div>By Viranch Mehta.</div>

<p style="color: grey;"><i>Updated March 20, 2012, 9:44 p.m.</i></p>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
 <table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">I fixed the QML battery monitor to be fairly usable and this diff merges \
it to master.</pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Applet and dataengine both tested and work fine.</pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">

 <li>plasma/generic/applets/CMakeLists.txt <span style="color: \
grey">(2dedcb2)</span></li>

 <li>plasma/generic/applets/batterymonitor/CMakeLists.txt <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/Messages.sh <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/README.txt <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/battery-oxygen-inkscape.svgz <span \
style="color: grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/battery-oxygen.svgz <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/contents/config/main.xml <span \
style="color: grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/contents/ui/IconButton.qml <span \
style="color: grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml <span \
style="color: grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml <span \
style="color: grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/contents/ui/config.ui <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/applets/batterymonitor/metadata.desktop <span style="color: \
grey">(PRE-CREATION)</span></li>

 <li>plasma/generic/dataengines/powermanagement/powermanagementengine.h <span \
style="color: grey">(20642c2)</span></li>

 <li>plasma/generic/dataengines/powermanagement/powermanagementengine.cpp <span \
style="color: grey">(5572fcb)</span></li>

 <li>plasma/generic/dataengines/powermanagement/powermanagementjob.h <span \
style="color: grey">(2c32015)</span></li>

 <li>plasma/generic/dataengines/powermanagement/powermanagementjob.cpp <span \
style="color: grey">(e205bb0)</span></li>

 <li>plasma/generic/dataengines/powermanagement/powermanagementservice.operations \
<span style="color: grey">(ad1301f)</span></li>

</ul>

<p><a href="http://git.reviewboard.kde.org/r/104226/diff/" style="margin-left: \
3em;">View Diff</a></p>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Screenshots </h1>

<div>

 <a href="http://git.reviewboard.kde.org/r/104226/s/482/"><img \
src="http://git.reviewboard.kde.org/media/uploaded/images/2012/03/20/battery_400x100.png" \
style="border: 1px black solid;" alt="" /></a>

</div>

  </td>
 </tr>
</table>

  </div>
 </body>
</html>

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel

[prev in list] [next in list] [prev in thread] [next in thread] 