Streamline device monitor naming scheme. #80
Merged
MicheleC
merged 1 commits from fix/hwmonitor into master 5 years ago
No reviewers
No Label
No Assignees
3 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: TDE/tdebase#80
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'fix/hwmonitor'
Deleting a branch is permanent. It CANNOT be undone. Continue?
As discussed and found consent in #72 this should be some WIP PR which streamlines and creates some consistent and logical naming and icon scheme for the Device Monitor (Tray application). So, togehter with the Device Informations TCC submenu and the Device Manager, there is a consistence behind that all.
It lacks also some icon in the about dialog, which have to be fixed and there is need to change some message source strings.
Translations should be done in at least
Credits and thanks to Vitaly (Vita_Cell) from IRC for contributing RU and ES translations. 👍
To change:
Signed-off-by: Chris xchrisx@uber.space
Same translation for both, hwdevicetray-autostart.desktop and hwdevicetray.desktop
GenericName[fr]=Moniteur de périphériques
Comment[fr]=Surveille les périphériques matériels depuis la barre d'état système
Thank you very much! 😄
WIP: Streamline device monitor naming scheme.to Streamline device monitor naming scheme. 5 years agoPlease see comments
GenericName[de]=GeräteüberwachungGenericName[es]=Monitor de dispositivosGenericName[fr]=Moniteur de périphériquesGenericName[it]=GenericName[it]=Monitor dei dispositivi hardware
Just by random I translated it and it seems it is more like a comment. Can you verify that again? Because this name will show up in TCC, so it should be in sync with other names like "Printers" and so on. Are you aware of that? If so all good. I just wanted to make sure.
Forgot about my comment about the translation. I just puzzled the GenericName and the Comment.
Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste herausComment[es]=Observe dispositivos desde área de notificaciónComment[fr]=Surveille les périphériques matériels depuis la barre d’état systèmeComment[it]=Comment[it]=Monitora i dispositivi hardware dall'area di notifica di sistema
X-TDE-UniqueApplet=trueX-TDE-autostart-condition=tdehwdevicetrayrc:General:Autostart:trueCategories=System;Applet;Categories=System;Applet;What is the change here? It seems the removed and added line is the same.
Yes, this "same line removed/added" wondered me too. Might be just Git. I have observed something like that to commits by Slavek and it was just Git showing that a bit confusing. What you see are empty lines at the end of the files, which I removed.
GenericName[de]=GeräteüberwachungGenericName[es]=Monitor de dispositivosGenericName[fr]=Moniteur de périphériquesGenericName[it]=GenericName[it]=Monitor dei dispositivi hardware
Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste herausComment[es]=Observe dispositivos desde área de notificaciónComment[fr]=Surveille les périphériques matériels depuis la barre d’état systèmeComment[it]=Comment[it]=Monitora i dispositivi hardware dall’area di notifica di sistema
};#endif#endifWhat is the change here? It seems the removed and added line is the same.
#undef DEF#undef WIN#undef WINWhat is the change here? It seems the removed and added line is the same.
}#include "hwdevicetray_configdialog.moc"#include "hwdevicetray_configdialog.moc"What is the change here? It seems the removed and added line is the same.
};#endif // CONFIGDIALOG_H#endif // CONFIGDIALOG_HWhat is the change here? It seems the removed and added line is the same.
#include "hwdevicetray_app.h"static const char hwdevicetrayVersion[] = "0.1";static const char hwdevicetrayVersion[] = "0.5";Why is the version number different? Is 0.5 somewhere else in the code and was 0.1 wrong?
I bumped the version number because it works better as 0.1 suggest. Also I think for R14.1, where this is included, it should be version 1.0. I have some planes for it and want to add some times too in other PRs most likely. Now, because there is come concept, it seemed a good thing to show it is further than 0.1.
Since there hasn't been any major change at the moment, I see not reason to bump to 0.5 now. We can bump this later when we add/change some functionality. I agree it would be good to have 1.0 in R14.1
I have changed it back to 0.1 - So we can bump it later, I am fine with that.
int main(int argc, char **argv){TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Hardware Device Monitor"), hwdevicetrayVersion, I18N_NOOP("Hardware Device Monitor Tray Application"), TDEAboutData::License_GPL_V3, "(c) 2015 Timothy Pearson", 0L, "");TDEAboutData aboutData("hwdevicetray", I18N_NOOP("Device Monitor"), hwdevicetrayVersion, I18N_NOOP("Device Monitor Tray Application\n\nAllows you not only to get informations about hardware changes on your system,\nbut also to securely open and eject any kind of storage devices."), TDEAboutData::License_GPL_V3,"but also to securely open and eject any kind of storage devices."
I would go for something a bit more conservative, such as:
"but also to open and eject storage devices if possible."
Keep in mind this may need to be updated again after LUKS PR is completed and merged.
Yes, you are right. I will change it that way and I know about that coming LUKS changes.
return app.exec();}}What is the change here? It seems the removed and added line is the same.
Should be ready for merge now. 👍
The "same lane" thing is not caused by git but by the removal of the last empty lane. If you do a binary comparison between old and new version you can see the last "0x0A" has been removed.
I usually prefer to add a 0x0A after the last non-empty lane to make sure all lanes are always read properly. Not sure if it is still the case, but years ago I ran into issues with files without an empty lane at the end. It may have been a bad program, but since that I use this good practice extensively.
Also it adds unnecesasry changes to the PR in this case.
Very interesting. Kate just showed me some empty line, which I just removed. I don't know how to add that back, to be honest.
I Just added the newlines back. 👍
Thanks for the corrections and the contribution 👍
45f848f6d2.