syncfront/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:31:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

* make host address and password label selectable

Browse Source 
* use bugs.kde.org as reporting address
* do not link anymore agains kde3_support
* make trayicon contextmenu actions working
* make left dialog images better looking (and use KStandardDirs::locate for loading)

svn path=/trunk/KDE/kdenetwork/krfb/; revision=648414
This commit is contained in:
Urs Wolfer
2007-03-31 09:44:33 +00:00
parent 8d98087e83
commit fa6995f39f
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
krfb/CMakeLists.txt
View File

@@ -32,7 +32,7 @@ kde4_add_ui_files(krfb_SRCS rfbconnectionwidget.ui
kde4_add_executable(krfb ${krfb_SRCS})
target_link_libraries(krfb ${KDE4_KIO_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${JPEG_LIBRARIES} ${SLP_LIBRARIES})
target_link_libraries(krfb ${KDE4_KIO_LIBS} ${JPEG_LIBRARIES} ${SLP_LIBRARIES})
install(TARGETS krfb DESTINATION ${BIN_INSTALL_DIR})

4
krfb/invitedialog.cc
View File

@@ -21,6 +21,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <KStandardDirs>
#include <KStandardGuiItem>
#include <qlabel.h>
@@ -39,8 +40,7 @@ InviteDialog::InviteDialog( QWidget *parent )
m_inviteWidget = new QWidget( this );
setupUi(m_inviteWidget);
pixmapLabel->setPixmap(
UserIcon( "connection-side-image.png" ) );
pixmapLabel->setPixmap(KStandardDirs::locate("data", "krfb/pics/connection-side-image.png"));
setMainWidget( m_inviteWidget );
setButtonGuiItem( User1, KStandardGuiItem::configure() );

3
krfb/main.cpp
View File

@@ -50,8 +50,7 @@ int main(int argc, char *argv[])
"(c) 2000, heXoNet Support GmbH, D-66424 Homburg\n"
"(c) 2000-2001, Const Kaplinsky\n"
"(c) 2000, Tridia Corporation\n"
"(c) 1999, AT&T Laboratories Cambridge\n",
0, "", "tim@tjansen.de");
"(c) 1999, AT&T Laboratories Cambridge\n");
aboutData.addAuthor("Alessandro Praduroux", I18N_NOOP("KDE4 porting"), "pradu@pradu.it");
aboutData.addAuthor("Tim Jansen", "", "tim@tjansen.de");
aboutData.addAuthor("Ian Reinhart Geiser", I18N_NOOP("DCOP interface"), "geiseri@kde.org");

4
krfb/manageinvitationsdialog.cpp
View File

@@ -17,6 +17,7 @@
#include <QToolTip>
#include <QCursor>
#include <KStandardDirs>
#include <KStandardGuiItem>
#include <KIconLoader>
@@ -32,8 +33,7 @@ ManageInvitationsDialog::ManageInvitationsDialog(QWidget *parent)
QWidget *main = new QWidget(this);
setupUi(main);
setMainWidget( main );
pixmapLabel->setPixmap( UserIcon( "connection-side-image.png" ) );
pixmapLabel->setPixmap(KStandardDirs::locate("data", "krfb/pics/connection-side-image.png"));
setButtonGuiItem( User1, KStandardGuiItem::configure() );

3
krfb/personalinvitedialog.cc
View File

@@ -24,6 +24,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <KStandardDirs>
#include <QToolTip>
#include <QNetworkInterface>
@@ -38,7 +39,7 @@ PersonalInviteDialog::PersonalInviteDialog( QWidget *parent )
m_inviteWidget = new QWidget ( this );
setupUi(m_inviteWidget);
pixmapLabel->setPixmap( UserIcon( "connection-side-image.png" ) );
pixmapLabel->setPixmap(KStandardDirs::locate("data", "krfb/pics/connection-side-image.png"));
QList<QNetworkInterface> ifl = QNetworkInterface::allInterfaces();

4
krfb/rfbconnectionwidget.ui
View File

@@ -103,10 +103,10 @@
</size>
</property>
<property name="frameShape" >
<enum>QFrame::WinPanel</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth" >
<number>0</number>

4
krfb/rfbmanageinvitations.ui
View File

@@ -99,10 +99,10 @@
</size>
</property>
<property name="frameShape" >
<enum>QFrame::WinPanel</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="scaledContents" >
<bool>true</bool>

10
krfb/rfbpersonalinvitewidget.ui
View File

@@ -83,10 +83,10 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<property name="frameShape" >
<enum>QFrame::WinPanel</enum>
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Sunken</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="scaledContents" >
<bool>true</bool>
@@ -125,6 +125,9 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy" >
<enum>Qt::NoFocus</enum>
</property>
<property name="textInteractionFlags" >
<enum>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</enum>
</property>
</widget>
</item>
<item row="3" column="1" >
@@ -176,6 +179,9 @@ p, li { white-space: pre-wrap; }
<property name="focusPolicy" >
<enum>Qt::NoFocus</enum>
</property>
<property name="textInteractionFlags" >
<enum>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</enum>
</property>
</widget>
</item>
<item row="4" column="2" >

11
krfb/trayicon.cpp
View File

@@ -50,13 +50,13 @@ TrayIcon::TrayIcon(KDialog *d) :
enableControlAction->setEnabled(false);
actionCollection.addAction("enable_control", enableControlAction);
connect(enableControlAction, SIGNAL(toggled(bool)), SIGNAL(enableDesktopControl(bool)));
contextMenu()->addAction("enable_control");
contextMenu()->addAction(actionCollection.action("enable_control"));
contextMenu()->addSeparator();
aboutAction = KStandardAction::aboutApp(this, SLOT(showAbout()), &actionCollection);
actionCollection.addAction("about", aboutAction);
contextMenu()->addAction("about");
contextMenu()->addAction(actionCollection.action("about"));
show();
}
@@ -66,21 +66,18 @@ TrayIcon::~TrayIcon(){
void TrayIcon::showAbout() {
KAboutApplicationDialog(KGlobal::mainComponent().aboutData()).exec();
// aboutDialog->show();
}
void TrayIcon::prepareQuit() {
quitting = true;
}
void TrayIcon::showConnectedMessage(QString host) {
setIcon(KIcon("eyes-open24"));
KPassivePopup::message(i18n("Desktop Sharing"),
i18n("The remote user has been authenticated and is now connected."),
trayIconOpen,
KIcon("eyes-open24").pixmap(22),
this);
setToolTip(i18n("Desktop Sharing - connected with %1", host));
}
@@ -93,7 +90,7 @@ void TrayIcon::showDisconnectedMessage() {
setIcon(KIcon("eyes-closed24"));
KPassivePopup *p = KPassivePopup::message(i18n("Desktop Sharing"),
i18n("The remote user has closed the connection."),
trayIconClosed,
KIcon("eyes-closed24").pixmap(22),
this);
connect(p, SIGNAL(hidden()), this, SIGNAL(diconnectedMessageDisplayed()));
}

3
krfb/trayicon.h
View File

@@ -54,9 +54,6 @@ protected:
void activated(QSystemTrayIcon::ActivationReason reason);
private:
QPixmap trayIconOpen;
QPixmap trayIconClosed;
KActionCollection actionCollection;
KAction* manageInvitationsAction;
KAction* aboutAction;