sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b)
- From: Florian Franzmann <siflfran AT hawo-net.de>
- To: Ladislav Hagara <ladislav.hagara AT unob.cz>
- Cc: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
- Subject: Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b)
- Date: Mon, 4 Feb 2013 17:53:20 +0100
On Mo 2013-02-04 11:55:00 +0100, Ladislav Hagara wrote:
> Hi,
> please, could you check hash, seems new tarball with same version number
> has been released.
The tarball has been changed, diff attached to this mail. Doesn't look
dangerous, IMO just a developer too lazy to increase the version
number.
best regards
Florian
> Thanks.
> Ladislav Hagara
>
>
> > GIT changes to master grimoire by Florian Franzmann
> > <siflfran AT hawo.stw.uni-erlangen.de>:
> >
> > video/minitube/0001-fix-build-with-gcc-4.7.patch | 25
> > -----------------------
> > video/minitube/DETAILS | 4 +--
> > video/minitube/HISTORY | 4 +++
> > video/minitube/PRE_BUILD | 3 --
> > 4 files changed, 6 insertions(+), 30 deletions(-)
> >
> > New commits:
> > commit f44e012b75c77d62a5f766f9036fb5287e37b061
> > Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> > Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
> >
> > video/minitube: version 2.0
> >
> > diff --git a/video/minitube/DETAILS b/video/minitube/DETAILS
> > index 22c054a..23754c8 100755
> > --- a/video/minitube/DETAILS
> > +++ b/video/minitube/DETAILS
> > @@ -11,10 +11,10 @@ if [[ "${MINITUBE_BRANCH}" == "scm" ]] ; then
> > SOURCE_IGNORE=volatile
> > FORCE_DOWNLOAD=on
> > else
> > - VERSION=1.9
> > + VERSION=2.0
> > SOURCE="${SPELL}-${VERSION}.tar.gz"
> > SOURCE_URL[0]=http://flavio.tordini.org/files/${SPELL}/${SOURCE}
> > -
> > SOURCE_HASH=sha512:bcf66703dc501204288bba2747fe63a42d85e63f658431d7bab237b1b51c83aa0ef8ca224382d130ff8c77836218eda425ff08c1dc5bb30ea1ecd4939c2eee67
> > +
> > SOURCE_HASH=sha512:3fea957f97b7fc289f9fabc176b2538100a530a04965e97d7a877a31cf906777b91b43ddc18f40473581de5878bde0644908922b2a9a835413dba0a5b5e4dccc
> > SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
> > fi
> >
>
--
diff -Naupr minitube-2.0.alt/src/main.cpp minitube-2.0.neu/src/main.cpp
--- minitube-2.0.alt/src/main.cpp 2013-02-03 00:49:59.000000000 +0100
+++ minitube-2.0.neu/src/main.cpp 2013-02-03 21:19:43.000000000 +0100
@@ -112,7 +112,7 @@ int main(int argc, char **argv) {
}
// qDebug() << "Using locale dir" << localeDir << locale;
QTranslator translator;
- translator.load(QLocale::system(), localeDir);
+ translator.load(QLocale::system(), QString(), QString(), localeDir);
app.installTranslator(&translator);
QTextCodec::setCodecForTr(QTextCodec::codecForName("utf8"));
diff -Naupr minitube-2.0.alt/src/mediaview.cpp minitube-2.0.neu/src/mediaview.cpp
--- minitube-2.0.alt/src/mediaview.cpp 2013-02-03 00:49:59.000000000 +0100
+++ minitube-2.0.neu/src/mediaview.cpp 2013-02-03 21:19:43.000000000 +0100
@@ -91,7 +91,7 @@ MediaView::MediaView(QWidget *parent) :
layout->addWidget(splitter);
splitter->setStretchFactor(0, 1);
- splitter->setStretchFactor(1, 6);
+ splitter->setStretchFactor(1, 5);
// restore splitter state
QSettings settings;
diff -Naupr minitube-2.0.alt/src/thlibrary/thblackbar.cpp minitube-2.0.neu/src/thlibrary/thblackbar.cpp
--- minitube-2.0.alt/src/thlibrary/thblackbar.cpp 2013-02-03 00:49:59.000000000 +0100
+++ minitube-2.0.neu/src/thlibrary/thblackbar.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,259 +0,0 @@
-#include <QPainter>
-#include <QPaintEvent>
-#include <QList>
-#include <QtGui>
-
-#include "thblackbar.h"
-#include "../fontutils.h"
-
-/* ============================================================================
- * PRIVATE Class
- */
-class THBlackBar::Private {
- public:
- QList<QAction *> actionList;
- QAction *checkedAction;
- QAction *hoveredAction;
-};
-
-/* ============================================================================
- * PUBLIC Constructor/Destructors
- */
-THBlackBar::THBlackBar (QWidget *parent)
- : QWidget(parent), d(new THBlackBar::Private)
-{
- // Setup Widget Options
- setMouseTracking(true);
-
- // Setup Members
- d->hoveredAction = NULL;
- d->checkedAction = NULL;
-}
-
-THBlackBar::~THBlackBar() {
- delete d;
-}
-
-/* ============================================================================
- * PUBLIC Methods
- */
-QAction *THBlackBar::addAction (QAction *action) {
- action->setCheckable(true);
- d->actionList.append(action);
- return(action);
-}
-
-QAction *THBlackBar::addAction (const QString& text) {
- QAction *action = new QAction(text, this);
- action->setCheckable(true);
- d->actionList.append(action);
- return(action);
-}
-
-void THBlackBar::setCheckedAction(int index) {
- if (d->checkedAction)
- d->checkedAction->setChecked(false);
- d->checkedAction = d->actionList.at(index);
- d->checkedAction->setChecked(true);
- update();
-}
-
-QSize THBlackBar::minimumSizeHint (void) const {
- int itemsWidth = calculateButtonWidth() * d->actionList.size();
- return(QSize(100 + itemsWidth, 32));
-}
-
-/* ============================================================================
- * PROTECTED Methods
- */
-void THBlackBar::paintEvent (QPaintEvent *event) {
- int height = rect().height();
- int width = rect().width();
- // int mh = (height / 2);
-
- // THPainter p(this);
- QPainter p(this);
-
- /*
- // Draw Background
- QLinearGradient linearGradUp(QPointF(0, 0), QPointF(0, mh));
- linearGradUp.setColorAt(0, QColor(0x97, 0x97, 0x97));
- linearGradUp.setColorAt(1, QColor(0x4d, 0x4d, 0x4d));
- p.fillRect(0, 0, width, mh, QBrush(linearGradUp));
-
- QLinearGradient linearGradDw(QPointF(0, mh), QPointF(0, height));
- linearGradDw.setColorAt(0, QColor(0x3a, 0x3a, 0x3a));
- linearGradDw.setColorAt(1, QColor(0x42, 0x42, 0x42));
- p.fillRect(0, mh, width, mh, QBrush(linearGradDw));
- */
-
- // Calculate Buttons Size & Location
- int buttonWidth = width / d->actionList.size(); // calculateButtonWidth();
- // int buttonsWidth = width; // buttonWidth * d->actionList.size();
- int buttonsX = 0; // (width / 2) - (buttonsWidth / 2);
-
- // Draw Buttons
- // p.translate(0, 4);
- QRect rect(buttonsX, 0, buttonWidth, height);
- foreach (QAction *action, d->actionList) {
- drawButton(&p, rect, action);
- rect.moveLeft(rect.x() + rect.width());
- }
- // p.translate(0, -4);
-
- // Draw Buttons Shadow
- // p.fillRect(buttonsX, height - 4, buttonsWidth, 1, QColor(0x6d, 0x6d, 0x6d));
-
- p.end();
-}
-
-void THBlackBar::mouseMoveEvent (QMouseEvent *event) {
- QWidget::mouseMoveEvent(event);
-
- QAction *action = hoveredAction(event->pos());
-
- if (action == NULL && d->hoveredAction != NULL) {
- // d->hoveredAction->hover(false);
- d->hoveredAction = NULL;
- update();
- } else if (action != NULL) {
- d->hoveredAction = action;
- action->hover();
- update();
-
- // status tip
- QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(window());
- if (mainWindow) mainWindow->statusBar()->showMessage(action->statusTip());
- }
-}
-
-void THBlackBar::mousePressEvent (QMouseEvent *event) {
- QWidget::mousePressEvent(event);
-
- if (d->hoveredAction != NULL) {
-
- if (d->checkedAction != NULL) {
- // already checked
- if (d->checkedAction == d->hoveredAction) return;
- d->checkedAction->setChecked(false);
- }
-
- d->checkedAction = d->hoveredAction;
- d->hoveredAction->setChecked(true);
- d->hoveredAction->trigger();
-
- update();
- }
-}
-
-void THBlackBar::leaveEvent(QEvent *event) {
- // status tip
- QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(window());
- if (mainWindow) mainWindow->statusBar()->clearMessage();
-}
-
-QAction *THBlackBar::hoveredAction (const QPoint& pos) const {
- if (pos.y() <= 0 || pos.y() >= height())
- return(NULL);
-
- /*
- int buttonWidth = calculateButtonWidth();
- int buttonsWidth = buttonWidth * d->actionList.size();
- int buttonsX = (width() / 2) - (buttonsWidth / 2);
- */
-
- int buttonWidth = width() / d->actionList.size(); // calculateButtonWidth();
- int buttonsWidth = width(); // buttonWidth * d->actionList.size();
- int buttonsX = 0; // (width / 2) - (buttonsWidth / 2);
-
- if (pos.x() <= buttonsX || pos.x() >= (buttonsX + buttonsWidth))
- return(NULL);
-
- int buttonIndex = (pos.x() - buttonsX) / buttonWidth;
-
- if (buttonIndex >= d->actionList.size())
- return(NULL);
- return(d->actionList[buttonIndex]);
-}
-
-int THBlackBar::calculateButtonWidth (void) const {
- QFont smallerBoldFont = FontUtils::smallBold();
- QFontMetrics fontMetrics(smallerBoldFont);
- int tmpItemWidth, itemWidth = 0;
- foreach (QAction *action, d->actionList) {
- tmpItemWidth = fontMetrics.width(action->text());
- if (itemWidth < tmpItemWidth) itemWidth = tmpItemWidth;
- }
- return itemWidth;
-}
-
-
-/* ============================================================================
- * PRIVATE Methods
- */
-void THBlackBar::drawUnselectedButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action)
-{
- QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, rect.height() / 2));
- linearGrad.setColorAt(0, QColor(0x8e, 0x8e, 0x8e));
- linearGrad.setColorAt(1, QColor(0x5c, 0x5c, 0x5c));
- /*
- QPalette palette;
- linearGrad.setColorAt(0, palette.color(QPalette::Dark));
- linearGrad.setColorAt(1, palette.color(QPalette::Midlight));
-*/
- drawButton(painter, rect, linearGrad, QColor(0x41, 0x41, 0x41), action);
- // drawButton(painter, rect, linearGrad, palette.color(QPalette::Shadow), action);
-}
-
-void THBlackBar::drawSelectedButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action)
-{
- QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, rect.height() / 2));
- linearGrad.setColorAt(0, QColor(0x6d, 0x6d, 0x6d));
- linearGrad.setColorAt(1, QColor(0x25, 0x25, 0x25));
- drawButton(painter, rect, linearGrad, QColor(0x00, 0x00, 0x00), action);
-}
-
-void THBlackBar::drawButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action)
-{
- if (action->isChecked())
- drawSelectedButton(painter, rect, action);
- else
- drawUnselectedButton(painter, rect, action);
-}
-
-void THBlackBar::drawButton ( QPainter *painter,
- const QRect& rect,
- const QLinearGradient& gradient,
- const QColor& color,
- const QAction *action)
-{
- painter->save();
-
- int height = rect.height();
- int width = rect.width();
- int mh = (height / 2);
-
- painter->translate(rect.x(), rect.y());
- painter->setPen(QColor(0x28, 0x28, 0x28));
-
- painter->fillRect(0, 0, width, mh, QBrush(gradient));
- painter->fillRect(0, mh, width, mh, color);
-#if defined(APP_MAC) | defined(APP_WIN)
- painter->drawRect(-1, -1, width+1, height);
-#else
- painter->drawRect(0, 0, width, height);
-#endif
- QFont smallerBoldFont = FontUtils::smallBold();
- painter->setFont(smallerBoldFont);
- painter->setPen(QPen(QColor(0xff, 0xff, 0xff), 1));
- painter->drawText(0, 1, width, height, Qt::AlignCenter, action->text());
-
- painter->restore();
-}
-
diff -Naupr minitube-2.0.alt/src/thlibrary/thblackbar.h minitube-2.0.neu/src/thlibrary/thblackbar.h
--- minitube-2.0.alt/src/thlibrary/thblackbar.h 2013-02-03 00:49:59.000000000 +0100
+++ minitube-2.0.neu/src/thlibrary/thblackbar.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-#ifndef _THBLACKBAR_H_
-#define _THBLACKBAR_H_
-
-#include <QWidget>
-#include <QAction>
-
-class THBlackBar : public QWidget {
-
- Q_OBJECT
-
- public:
- THBlackBar (QWidget *parent = 0);
- ~THBlackBar();
-
- public:
- QAction *addAction (QAction *action);
- QAction *addAction (const QString& text);
- void setCheckedAction(int index);
-
- QSize minimumSizeHint (void) const;
-
- protected:
- void paintEvent (QPaintEvent *event);
-
- void mouseMoveEvent (QMouseEvent *event);
- void mousePressEvent (QMouseEvent *event);
- void leaveEvent(QEvent *event);
-
- private:
- void drawUnselectedButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action);
- void drawSelectedButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action);
- void drawButton ( QPainter *painter,
- const QRect& rect,
- const QAction *action);
- void drawButton ( QPainter *painter,
- const QRect& rect,
- const QLinearGradient& gradient,
- const QColor& color,
- const QAction *action);
-
- QAction *hoveredAction (const QPoint& pos) const;
- int calculateButtonWidth (void) const;
-
- private:
- class Private;
- Private *d;
-};
-
-#endif /* !_THBLACKBAR_H_ */
-
diff -Naupr minitube-2.0.alt/src/thlibrary/thlibrary.pri minitube-2.0.neu/src/thlibrary/thlibrary.pri
--- minitube-2.0.alt/src/thlibrary/thlibrary.pri 2013-02-03 00:49:59.000000000 +0100
+++ minitube-2.0.neu/src/thlibrary/thlibrary.pri 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-HEADERS += thblackbar.h
-SOURCES += thblackbar.cpp
-
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b),
Florian Franzmann, 02/03/2013
-
Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b),
Ladislav Hagara, 02/04/2013
- Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b), Florian Franzmann, 02/04/2013
-
Re: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (53b9f58f2808642d9a31114cab927e4bbd38147b),
Ladislav Hagara, 02/04/2013
Archive powered by MHonArc 2.6.24.