Commit 62eb7294 authored by Denis Kuplyakov's avatar Denis Kuplyakov
Browse files

Merge branch 'master' into deniskup/newdesign/nopatch

Conflicts:
	colorscheme.h
	kreversiview.cpp
	qml/Board.qml
	qml/Cell.qml
	qml/Chip.qml
	qml/Popup.qml
	qml/Table.qml

Merged changes from master to make code compatible for review.
parents b6757a29 8109a814
......@@ -44,7 +44,7 @@ kde4_add_executable(kreversi ${kreversi_SRCS})
target_link_libraries(kreversi kdegames ${KDE4_KDEUI_LIBS}
${QT_QTXML_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDECLARATIVE_LIBRARIES})
${QT_QTDECLARATIVE_LIBRARY} ${KDECLARATIVE_LIBRARIES})
install(TARGETS kreversi ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
......
......@@ -34,7 +34,6 @@ class ColorScheme : public QDeclarativeItem
Q_PROPERTY(QColor background READ background NOTIFY placeHolder)
Q_PROPERTY(QColor foreground READ foreground NOTIFY placeHolder)
Q_PROPERTY(QColor border READ border NOTIFY placeHolder)
public:
ColorScheme(QDeclarativeItem *parent = 0);
......
......@@ -126,7 +126,7 @@ void KReversiView::updateBoard()
Q_ARG(QVariant, m_game ? m_game->getPreAnimationDelay(KReversiPos(i, j)) : 0));
}
}
for (int i = 0; i < 8; i++)
for (int j = 0; j < 8; j++) {
QString new_state = "";
......
......@@ -175,5 +175,10 @@ private:
* If true board labels will be rendered
*/
bool m_showLabels;
/**
* Used to handle animation duration due to sequental turning of chips
*/
int m_maxDelay;
};
#endif
......@@ -162,6 +162,7 @@ Item {
duration: animationTime
easing.type: Easing.InOutQuad
}
}
}
......
......@@ -103,7 +103,7 @@ Name[ta]=சொடுக்கு
Name[te]=క్లిక్
Name[tg]=Ангуштзанӣ
Name[tr]=Tık
Name[ug]=يەككە چەك
Name[ug]=چەك
Name[uk]=Клац
Name[wa]=Clitchî
Name[x-test]=xxClickxx
......@@ -169,7 +169,7 @@ Comment[ta]=சொடுக்கு
Comment[te]=క్లిక్
Comment[tg]=Ангушт задан
Comment[tr]=Tık
Comment[ug]=يەككە چەك
Comment[ug]=چەك
Comment[uk]=Клац
Comment[wa]=Clitchî
Comment[x-test]=xxClickxx
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment