TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Streamline device monitor naming scheme.

Browse Source 
Signed-off-by: Chris <xchrisx@uber.space>
pull/82/head
Chris 6 years ago committed by TDE Gitea
parent 752183c265
commit 45f848f6d2
6 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File

20
kcontrol/hwmanager/hwdevicetray-autostart.desktop
Unescape Escape View File

@ -1,9 +1,25 @@
[Desktop Entry] [Desktop Entry]
Name=tdehwdevicetray Name=tdehwdevicetray
GenericName=Hardware Device Monitor
GenericName=Device Monitor
GenericName[cs]=Sledování zařízení
GenericName[de]=Geräteüberwachung
GenericName[es]=Monitor de dispositivos
GenericName[fr]=Moniteur de périphériques
GenericName[it]=Monitor dei dispositivi hardware
GenericName[ru]=Диспетчер устройств
Comment=Monitor hardware devices from the system tray Comment=Monitor hardware devices from the system tray
Comment[cs]=Sledování hardwarových zařízení ze systémového panelu
Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste heraus
Comment[es]=Observe dispositivos desde área de notificación
Comment[fr]=Surveille les périphériques matériels depuis la barre d’état système
Comment[it]=Monitora i dispositivi hardware dall’area di notifica di sistema
Comment[ru]=Отслеживание устройств в области уведомлений
Exec=tdehwdevicetray Exec=tdehwdevicetray
Icon=kcmdevices Icon=hwinfo
X-TDE-autostart-after=panel X-TDE-autostart-after=panel
X-TDE-StartupNotify=false X-TDE-StartupNotify=false
X-TDE-UniqueApplet=true X-TDE-UniqueApplet=true

12
kcontrol/hwmanager/hwdevicetray.cpp
Unescape Escape View File

@ -59,10 +59,10 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget* parent, const char *name)
TDEPopupMenu *help = m_help->menu(); TDEPopupMenu *help = m_help->menu();
help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents()));
setPixmap(KSystemTray::loadIcon("kcmdevices")); setPixmap(KSystemTray::loadIcon("hwinfo"));
setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
TQToolTip::add(this, i18n("Hardware device monitor")); TQToolTip::add(this, i18n("Device monitor"));
m_parent = parent; m_parent = parent;
globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
@ -98,7 +98,7 @@ HwDeviceSystemTray::~HwDeviceSystemTray() {
void HwDeviceSystemTray::_quit () { void HwDeviceSystemTray::_quit () {
r_config = new KSimpleConfig("tdehwdevicetrayrc"); r_config = new KSimpleConfig("tdehwdevicetrayrc");
TQString tmp1 = i18n ("Start hardware device tray automatically when you log in?"); TQString tmp1 = i18n ("Start device monitor automatically when you log in?");
int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start")); int tmp2 = KMessageBox::questionYesNo (0, tmp1, i18n("Question"), i18n("Start Automatically"), i18n("Do Not Start"));
r_config->setGroup("General"); r_config->setGroup("General");
r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes); r_config->writeEntry ("Autostart", tmp2 == KMessageBox::Yes);
@ -112,7 +112,7 @@ void HwDeviceSystemTray::resizeTrayIcon () {
TQPixmap origpixmap; TQPixmap origpixmap;
TQPixmap scaledpixmap; TQPixmap scaledpixmap;
TQImage newIcon; TQImage newIcon;
origpixmap = KSystemTray::loadSizedIcon("kcmdevices", width()); origpixmap = KSystemTray::loadSizedIcon("hwinfo", width());
newIcon = origpixmap; newIcon = origpixmap;
newIcon = newIcon.smoothScale(width(), height()); newIcon = newIcon.smoothScale(width(), height());
scaledpixmap = newIcon; scaledpixmap = newIcon;
@ -195,7 +195,7 @@ void HwDeviceSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) {
menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration")); menu->insertTitle(SmallIcon("configure"), i18n("Global Configuration"));
TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Hardware..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection()); TDEAction *actHardwareConfig = new TDEAction(i18n("Configure Devices..."), SmallIconSet("kcmpci"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotHardwareConfig()), actionCollection());
actHardwareConfig->plug(menu); actHardwareConfig->plug(menu);
TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection()); TDEAction *actShortcutKeys = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotEditShortcutKeys()), actionCollection());
@ -318,7 +318,7 @@ void HwDeviceSystemTray::slotHardwareConfig() {
KCMultiDialog *kcm = new KCMultiDialog(KDialogBase::Plain, i18n("Configure"), this); KCMultiDialog *kcm = new KCMultiDialog(KDialogBase::Plain, i18n("Configure"), this);
kcm->addModule("hwmanager"); kcm->addModule("hwmanager");
kcm->setPlainCaption(i18n("Configure Hardware")); kcm->setPlainCaption(i18n("Configure Devices"));
kcm->exec(); kcm->exec();
} }

20
kcontrol/hwmanager/hwdevicetray.desktop
Unescape Escape View File

@ -1,9 +1,25 @@
[Desktop Entry] [Desktop Entry]
Name=tdehwdevicetray Name=tdehwdevicetray
GenericName=Hardware Device Monitor
GenericName=Device Monitor
GenericName[cs]=Sledování zařízení
GenericName[de]=Geräteüberwachung
GenericName[es]=Monitor de dispositivos
GenericName[fr]=Moniteur de périphériques
GenericName[it]=Monitor dei dispositivi hardware
GenericName[ru]=Диспетчер устройств
Comment=Monitor hardware devices from the system tray Comment=Monitor hardware devices from the system tray
Comment[cs]=Sledování hardwarových zařízení ze systémového panelu
Comment[de]=Überwacht Hardware-Geräte aus dem Systembereich der Kontrollleiste heraus
Comment[es]=Observe dispositivos desde área de notificación
Comment[fr]=Surveille les périphériques matériels depuis la barre d’état système
Comment[it]=Monitora i dispositivi hardware dall’area di notifica di sistema
Comment[ru]=Отслеживание устройств в области уведомлений
Exec=tdehwdevicetray Exec=tdehwdevicetray
Icon=kcmdevices Icon=hwinfo
Type=Application Type=Application
OnlyShowIn=TDE; OnlyShowIn=TDE;
Categories=Qt;TDE;System; Categories=Qt;TDE;System;

2
kcontrol/hwmanager/hwdevicetray_bindings.cpp
Unescape Escape View File

@ -26,7 +26,7 @@
#endif #endif
#define WIN KKey::QtWIN #define WIN KKey::QtWIN
keys->insert( "Program:hwdevicetray", i18n("Hardware Device Control") ); keys->insert( "Program:hwdevicetray", i18n("Device Control") );
// DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() ); // DEF( I18N_NOOP("Switch Displays"), TDEShortcut(TQString("XF86Display")), TDEShortcut(TQString("XF86Display")), slotCycleDisplays() );

2
kcontrol/hwmanager/hwdevicetray_configdialog.cpp
Unescape Escape View File

@ -38,7 +38,7 @@
ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, bool isApplet) ConfigDialog::ConfigDialog(TDEGlobalAccel *accel, bool isApplet)
: KDialogBase(Tabbed, i18n("Configure"), Ok | Cancel | Help, Ok, 0L, "config dialog") { : KDialogBase(Tabbed, i18n("Configure"), Ok | Cancel | Help, Ok, 0L, "config dialog") {
if (isApplet) { if (isApplet) {
setHelp(TQString::null, "tderandrtray"); setHelp(TQString::null, "tdehwdevicetray");
} }
TQFrame *w = 0L; // the parent for the widgets TQFrame *w = 0L; // the parent for the widgets

3
kcontrol/hwmanager/hwdevicetray_main.cpp
Unescape Escape View File

@ -36,7 +36,8 @@ static const TDECmdLineOptions options[] =
int main(int argc, char **argv) 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 open and eject storage devices if possible."), TDEAboutData::License_GPL_V3,
"(c) 2015 Timothy Pearson\n(c) 2019 The Trinity Desktop Project", 0L, "");
aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Initial developer and maintainer"), "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",I18N_NOOP("Initial developer and maintainer"), "kb9vqf@pearsoncomputing.net");
aboutData.setProductName("hwdevices/hwdevicetray"); aboutData.setProductName("hwdevices/hwdevicetray");
TDEGlobal::locale()->setMainCatalogue("tdehwdevicetray"); TDEGlobal::locale()->setMainCatalogue("tdehwdevicetray");

Write Preview
Loading…
Cancel
Save