compile
svn path=/branches/work/kwin_composite/; revision=612696
This commit is contained in:
Volker Krause
parent
95d717177d
commit
7433a0d2fb
3 changed files with 69 additions and 21 deletions
|
|
@ -4,26 +4,26 @@
|
|||
########### next target ###############
|
||||
set(kwin_update_window_settings_SRCS update_window_settings.cpp)
|
||||
|
||||
kde4_automoc(${kwin_update_window_settings_SRCS})
|
||||
kde4_automoc(kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
||||
|
||||
kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
||||
|
||||
target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS} ${QT_QT3SUPPORT_LIBRARY})
|
||||
|
||||
install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
|
||||
install_targets(/lib/kconf_update_bin/ kwin_update_window_settings )
|
||||
|
||||
|
||||
|
||||
########### next target ###############
|
||||
set(kwin_update_default_rules_SRCS update_default_rules.cpp)
|
||||
|
||||
kde4_automoc(${kwin_update_default_rules})
|
||||
kde4_automoc(kwin_update_default_rules ${kwin_update_default_rules})
|
||||
|
||||
kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
|
||||
|
||||
target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
|
||||
|
||||
install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
|
||||
install_targets(/lib/kconf_update_bin/ kwin_update_default_rules )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
|
@ -33,3 +33,33 @@ install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} )
|
|||
install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
||||
install(PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules
|
||||
#kconfdir = $(libdir)/kconf_update_bin
|
||||
#
|
||||
#kwin_update_window_settings_SOURCES = update_window_settings.cpp
|
||||
#kwin_update_window_settings_LDADD = $(LIB_KDECORE) $(KDE_RPATH)
|
||||
#kwin_update_window_settings_LDFLAGS = $(all_libraries)
|
||||
#
|
||||
#kwin_update_default_rules_SOURCES = update_default_rules.cpp
|
||||
#kwin_update_default_rules_LDADD = $(LIB_KDECORE) $(KDE_RPATH)
|
||||
#kwin_update_default_rules_LDFLAGS = $(all_libraries)
|
||||
#
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#sounddir= $(kde_sounddir)
|
||||
#sound_DATA = pop.wav
|
||||
#
|
||||
#update_DATA = kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd \
|
||||
# kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd
|
||||
#update_SCRIPTS = pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh
|
||||
#updatedir = $(kde_datadir)/kconf_update
|
||||
#
|
||||
#kwin_default_rules_DATA = fsp_workarounds_1
|
||||
#kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules
|
||||
|
|
|
|||
|
|
@ -5,21 +5,45 @@
|
|||
|
||||
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
|
||||
|
||||
kde4_automoc(${kcm_kwinoptions_PART_SRCS})
|
||||
kde4_automoc(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
|
||||
|
||||
kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})
|
||||
|
||||
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinoptions )
|
||||
|
||||
target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY})
|
||||
target_link_libraries(kcm_kwinoptions ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS})
|
||||
|
||||
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kwinoptions.desktop kwinactions.desktop kwinadvanced.desktop
|
||||
kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop
|
||||
DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
install( FILES kwinoptions.desktop DESTINATION ${XDG_APPS_DIR} )
|
||||
install( FILES kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop DESTINATION ${APPLNK_INSTALL_DIR}/.hidden )
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#METASOURCES = AUTO
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kcm_kwinoptions.la
|
||||
#
|
||||
#kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
|
||||
#kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
|
||||
#kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#noinst_HEADERS = windows.h mouse.h
|
||||
#
|
||||
#messages:
|
||||
# $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
|
||||
#
|
||||
#kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop
|
||||
#kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden
|
||||
#
|
||||
#xdg_apps_DATA = kwinoptions.desktop
|
||||
#KDE_ICON=AUTO
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
#include <QVBoxLayout>
|
||||
#include <kmessagebox.h>
|
||||
|
||||
#include <qlabel.h>
|
||||
#include <k3activelabel.h>
|
||||
#include <klocale.h>
|
||||
#include <kcolorbutton.h>
|
||||
#include <kconfig.h>
|
||||
|
|
@ -689,7 +689,7 @@ void KAdvancedConfig::load( void )
|
|||
setShadeHover(config->readEntry(KWIN_SHADEHOVER, QVariant(false)).toBool());
|
||||
setShadeHoverInterval(config->readEntry(KWIN_SHADEHOVER_INTERVAL, 250));
|
||||
|
||||
setElectricBorders(config->readEntry(KWM_ELECTRIC_BORDER, 0));
|
||||
setElectricBorders(config->readEntry(KWM_ELECTRIC_BORDER, false));
|
||||
setElectricBorderDelay(config->readEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
|
||||
|
||||
// setFocusStealing( config->readEntry(KWIN_FOCUS_STEALING, 2 ));
|
||||
|
|
@ -1244,7 +1244,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, KI
|
|||
QVBoxLayout *lay = new QVBoxLayout (this);
|
||||
kompmgrAvailable_ = kompmgrAvailable();
|
||||
if (!kompmgrAvailable_){
|
||||
QLabel *label = new QLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
|
||||
K3ActiveLabel *label = new K3ActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
|
||||
"Please make sure you have "
|
||||
"<a href=\"http://www.freedesktop.org/\">Xorg ≥ 6.8</a>,"
|
||||
" and have installed the kompmgr that came with kwin.<br>"
|
||||
|
|
@ -1255,8 +1255,6 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, KI
|
|||
"And if your GPU provides hardware-accelerated Xrender support (mainly nVidia cards):<br><br>"
|
||||
"<i>Option \"RenderAccel\" \"true\"</i><br>"
|
||||
"In <i>Section \"Device\"</i></qt>"), this);
|
||||
label->setOpenExternalLinks(true);
|
||||
label->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
|
||||
lay->addWidget(label);
|
||||
}
|
||||
else
|
||||
|
|
@ -1477,10 +1475,8 @@ void KTranslucencyConfig::load( void )
|
|||
|
||||
if (!kompmgrAvailable_)
|
||||
return;
|
||||
config->setGroup( "Notification Messages" );
|
||||
useTranslucency->setChecked(config->readEntry("UseTranslucency", QVariant(false)).toBool());
|
||||
|
||||
config->setGroup( "Translucency" );
|
||||
useTranslucency->setChecked(config->readEntry("UseTranslucency", QVariant(false)).toBool());
|
||||
activeWindowTransparency->setChecked(config->readEntry("TranslucentActiveWindows", QVariant(false)).toBool());
|
||||
inactiveWindowTransparency->setChecked(config->readEntry("TranslucentInactiveWindows", QVariant(true)).toBool());
|
||||
movingWindowTransparency->setChecked(config->readEntry("TranslucentMovingWindows", QVariant(false)).toBool());
|
||||
|
|
@ -1540,10 +1536,8 @@ void KTranslucencyConfig::save( void )
|
|||
{
|
||||
if (!kompmgrAvailable_)
|
||||
return;
|
||||
config->setGroup( "Notification Messages" );
|
||||
config->writeEntry("UseTranslucency",useTranslucency->isChecked());
|
||||
|
||||
config->setGroup( "Translucency" );
|
||||
config->writeEntry("UseTranslucency",useTranslucency->isChecked());
|
||||
config->writeEntry("TranslucentActiveWindows",activeWindowTransparency->isChecked());
|
||||
config->writeEntry("TranslucentInactiveWindows",inactiveWindowTransparency->isChecked());
|
||||
config->writeEntry("TranslucentMovingWindows",movingWindowTransparency->isChecked());
|
||||
|
|
|
|||
Loading…
Reference in a new issue