alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix property/signal names

Browse Source
This commit is contained in:
Marco Martin 2011-10-27 21:24:40 +02:00
parent 08ac59edd7
commit 63fbf58b53
5 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
declarativeimports/core/theme.cpp
View File

@ -41,27 +41,27 @@ FontProxy::FontProxy(Plasma::Theme::FontRole role, QObject *parent)
m_fontRole(role)
{
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(boldChanged()));
this, SIGNAL(boldChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(capitalizationChanged()));
this, SIGNAL(capitalizationChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(familyChanged()));
this, SIGNAL(familyChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(italicChanged()));
this, SIGNAL(italicChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(letterSpacingChanged()));
this, SIGNAL(letterSpacingChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(pixelSizeChanged()));
this, SIGNAL(pixelSizeChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(pointSizeChanged()));
this, SIGNAL(pointSizeChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(strikeOutChanged()));
this, SIGNAL(strikeoutChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(underlineChanged()));
this, SIGNAL(underlineChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(weightChanged()));
this, SIGNAL(weightChanged()));
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(wordSpacingChanged()));
this, SIGNAL(wordSpacingChanged()));
}
FontProxy::~FontProxy()
@ -118,7 +118,7 @@ qreal FontProxy::pointSize() const
return Plasma::Theme::defaultTheme()->font(m_fontRole).pointSize();
}
bool FontProxy::strikeOut() const
bool FontProxy::strikeout() const
{
return Plasma::Theme::defaultTheme()->font(m_fontRole).strikeOut();
}

6
declarativeimports/core/theme_p.h
View File

@ -37,7 +37,7 @@ class FontProxy : public QObject
Q_PROPERTY(qreal letterSpacing READ letterSpacing NOTIFY letterSpacingChanged )
Q_PROPERTY(int pixelSize READ pixelSize NOTIFY pixelSizeChanged )
Q_PROPERTY(qreal pointSize READ pointSize NOTIFY pointSizeChanged )
Q_PROPERTY(bool strikeOut READ strikeOut NOTIFY strikeOutChanged )
Q_PROPERTY(bool strikeout READ strikeout NOTIFY strikeoutChanged )
Q_PROPERTY(bool underline READ underline NOTIFY underlineChanged )
Q_PROPERTY(Weight weight READ weight NOTIFY weightChanged )
Q_PROPERTY(qreal wordSpacing READ wordSpacing NOTIFY wordSpacingChanged )
@ -75,7 +75,7 @@ public:
qreal letterSpacing() const;
int pixelSize() const;
qreal pointSize() const;
bool strikeOut() const;
bool strikeout() const;
bool underline() const;
Weight weight() const;
qreal wordSpacing() const;
@ -88,7 +88,7 @@ Q_SIGNALS:
void letterSpacingChanged();
void pixelSizeChanged();
void pointSizeChanged();
void strikeOutChanged();
void strikeoutChanged();
void underlineChanged();
void weightChanged();
void wordSpacingChanged();

1
declarativeimports/plasmacomponents/qml/ScrollBar.qml
View File

@ -26,6 +26,7 @@ Item {
// Common API
property Flickable flickableItem: null
property bool interactive
// Plasma API
property int orientation: Qt.Horizontal

4
declarativeimports/plasmacomponents/qml/TextArea.qml
View File

@ -89,6 +89,10 @@ Item {
opacity: enabled ? 1.0 : 0.5
PlasmaCore.Theme {
id: theme
}
PlasmaCore.FrameSvgItem {
id: hover

20
declarativeimports/plasmacomponents/qml/qmldir
View File

@ -21,4 +21,22 @@ Switch 0.1 Switch.qml
TextArea 0.1 TextArea.qml
TextField 0.1 TextField.qml
ToolBar 0.1 ToolBar.qml
ToolButton 0.1 ToolButton.qml
ToolButton 0.1 ToolButton.qml
ListItem 0.1 ToolButton.qml
Window 0.1 Window.qml
Menu 0.1 Menu.qml
MenuItem 0.1 MenuItem.qml
MenuLayout 0.1 MenuLayout.qml
Page 0.1 Page.qml
PageStack 0.1 PageStack.qml
SelectionDialog 0.1 SelectionDialog.qml
Dialog 0.1 Dialog.qml
QueryDialog 0.1 QueryDialog.qml
ContextMenu 0.1 ContextMenu.qml
TabBar 0.1 TabBar.qml
TabBarLayout 0.1 TabBarLayout.qml
TabButton 0.1 TabButton.qml
TabGroup 0.1 TabGroup.qml
SectionScroller 0.1 SectionScroller.qml
CommonDialog 0.1 CommonDialog.qml