diff options
| -rwxr-xr-x | AAP.svg | 314 | ||||
| -rw-r--r-- | main.cpp | 3 | ||||
| -rw-r--r-- | player.cpp | 3 | ||||
| -rw-r--r-- | player.h | 2 | ||||
| -rw-r--r-- | player.ui | 22 | ||||
| -rw-r--r-- | scripts/appveyor.bat | 2 |
6 files changed, 180 insertions, 166 deletions
@@ -8,104 +8,104 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="AAP.svg" - inkscape:version="1.0 (4035a4fb49, 2020-05-01)" - id="svg1957" + width="1000mm" + height="1000mm" + viewBox="0 0 1000 1000" version="1.1" - viewBox="0 0 100 100" - height="100mm" - width="100mm"> + id="svg1957" + inkscape:version="1.0 (4035a4fb49, 2020-05-01)" + sodipodi:docname="AAP.svg"> <defs id="defs1951"> <filter - height="1.12" - y="-0.059999999" - width="1.12" - x="-0.059999999" - id="filter3581-5" + inkscape:collect="always" style="color-interpolation-filters:sRGB" - inkscape:collect="always"> + id="filter3581-5" + x="-0.059999999" + width="1.12" + y="-0.059999999" + height="1.12"> <feGaussianBlur - id="feGaussianBlur3583-0" + inkscape:collect="always" stdDeviation="11.72299" - inkscape:collect="always" /> + id="feGaussianBlur3583-0" /> </filter> <linearGradient - gradientTransform="matrix(0.562833,0,0,0.562833,120.95711,117.57609)" - gradientUnits="userSpaceOnUse" - y2="241.81548" - x2="199.57143" - y1="58.875" - x1="4.1577382" - id="linearGradient4532-0" + inkscape:collect="always" xlink:href="#linearGradient3954" - inkscape:collect="always" /> + id="linearGradient4532-0" + x1="4.1577382" + y1="58.875" + x2="199.57143" + y2="241.81548" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.562833,0,0,0.562833,120.95711,117.57609)" /> <linearGradient - inkscape:collect="always" - id="linearGradient3954"> + id="linearGradient3954" + inkscape:collect="always"> <stop - style="stop-color:#ff8807;stop-opacity:1" + id="stop3950" offset="0" - id="stop3950" /> + style="stop-color:#ff8807;stop-opacity:1" /> <stop - style="stop-color:#975100;stop-opacity:1" + id="stop3952" offset="1" - id="stop3952" /> + style="stop-color:#975100;stop-opacity:1" /> </linearGradient> <filter - inkscape:collect="always" - style="color-interpolation-filters:sRGB" - id="filter3168" - x="-0.048" - width="1.096" + height="1.096" y="-0.048" - height="1.096"> + width="1.096" + x="-0.048" + id="filter3168" + style="color-interpolation-filters:sRGB" + inkscape:collect="always"> <feGaussianBlur - inkscape:collect="always" + id="feGaussianBlur3170" stdDeviation="1.5378906" - id="feGaussianBlur3170" /> + inkscape:collect="always" /> </filter> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2924" - id="linearGradient2918" - x1="120.119" - y1="133.34694" - x2="232.47932" + gradientUnits="userSpaceOnUse" y2="247.911" - gradientUnits="userSpaceOnUse" /> + x2="232.47932" + y1="133.34694" + x1="120.119" + id="linearGradient2918" + xlink:href="#linearGradient2924" + inkscape:collect="always" /> <linearGradient - id="linearGradient2924" - inkscape:collect="always"> + inkscape:collect="always" + id="linearGradient2924"> <stop - id="stop2920" + style="stop-color:#fcff00;stop-opacity:1" offset="0" - style="stop-color:#fcff00;stop-opacity:1" /> + id="stop2920" /> <stop - id="stop2922" + style="stop-color:#b09100;stop-opacity:1" offset="1" - style="stop-color:#b09100;stop-opacity:1" /> + id="stop2922" /> </linearGradient> </defs> <sodipodi:namedview - inkscape:window-maximized="0" - inkscape:window-y="34" - inkscape:window-x="569" - inkscape:window-height="908" - inkscape:window-width="1343" - showgrid="false" - inkscape:document-rotation="0" - inkscape:current-layer="layer1" - inkscape:document-units="mm" - inkscape:cy="304.17278" - inkscape:cx="708.27688" - inkscape:zoom="0.49497475" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - borderopacity="1.0" - bordercolor="#666666" + id="base" pagecolor="#ffffff" - id="base" /> + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.12374369" + inkscape:cx="2579.6705" + inkscape:cy="799.47074" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + inkscape:document-rotation="0" + showgrid="false" + inkscape:window-width="1343" + inkscape:window-height="908" + inkscape:window-x="569" + inkscape:window-y="34" + inkscape:window-maximized="0" /> <metadata id="metadata1954"> <rdf:RDF> @@ -119,127 +119,127 @@ </rdf:RDF> </metadata> <g - id="layer1" + inkscape:label="Layer 1" inkscape:groupmode="layer" - inkscape:label="Layer 1"> + id="layer1"> <g - inkscape:export-ydpi="96" + id="g3354" + transform="matrix(10.267165,0,0,10.267547,-1289.1305,-1500.2746)" inkscape:export-xdpi="96" - transform="translate(-123.7713,-144.38989)" - id="g3354"> + inkscape:export-ydpi="96"> <path - style="fill:#000c80;fill-opacity:1;stroke-width:0.224156" - id="path817-9" - sodipodi:type="arc" - sodipodi:cx="174.25737" - sodipodi:cy="194.81694" - sodipodi:rx="48.673847" - sodipodi:ry="48.673847" - sodipodi:start="0" - sodipodi:end="6.2105971" - sodipodi:open="true" + d="m 222.93122,194.81694 a 48.673847,48.673847 0 0 1 -47.79061,48.66583 48.673847,48.673847 0 0 1 -49.52503,-46.89964 48.673847,48.673847 0 0 1 45.99324,-50.36792 48.673847,48.673847 0 0 1 51.19422,45.07168" sodipodi:arc-type="arc" - d="m 222.93122,194.81694 a 48.673847,48.673847 0 0 1 -47.79061,48.66583 48.673847,48.673847 0 0 1 -49.52503,-46.89964 48.673847,48.673847 0 0 1 45.99324,-50.36792 48.673847,48.673847 0 0 1 51.19422,45.07168" /> - <path - style="fill:#191919;fill-opacity:1;stroke-width:1.78393;filter:url(#filter3581-5)" - id="path819-8-6" - sodipodi:type="arc" - sodipodi:cx="703.04071" - sodipodi:cy="251.83664" - sodipodi:rx="234.45979" - sodipodi:ry="234.45979" - sodipodi:start="0" - sodipodi:end="6.2630301" sodipodi:open="true" - transform="matrix(0.18545219,0,0,0.18545219,43.87694,148.11327)" - sodipodi:arc-type="arc" - d="M 937.5005,251.83664 A 234.45979,234.45979 0 0 1 704.2221,486.29346 234.45979,234.45979 0 0 1 468.59282,254.19939 234.45979,234.45979 0 0 1 699.49666,17.403634 234.45979,234.45979 0 0 1 937.45288,247.11137" /> - <path - style="fill:url(#linearGradient4532-0);fill-opacity:1;stroke-width:0.330834" - id="path819-3" - sodipodi:type="arc" - sodipodi:cx="174.25737" - sodipodi:cy="194.81694" - sodipodi:rx="43.481079" - sodipodi:ry="43.481079" + sodipodi:end="6.2105971" sodipodi:start="0" - sodipodi:end="6.2630301" + sodipodi:ry="48.673847" + sodipodi:rx="48.673847" + sodipodi:cy="194.81694" + sodipodi:cx="174.25737" + sodipodi:type="arc" + id="path817-9" + style="fill:#000c80;fill-opacity:1;stroke-width:0.224156" /> + <path + d="M 937.5005,251.83664 A 234.45979,234.45979 0 0 1 704.2221,486.29346 234.45979,234.45979 0 0 1 468.59282,254.19939 234.45979,234.45979 0 0 1 699.49666,17.403634 234.45979,234.45979 0 0 1 937.45288,247.11137" + sodipodi:arc-type="arc" + transform="matrix(0.18545219,0,0,0.18545219,43.87694,148.11327)" sodipodi:open="true" + sodipodi:end="6.2630301" + sodipodi:start="0" + sodipodi:ry="234.45979" + sodipodi:rx="234.45979" + sodipodi:cy="251.83664" + sodipodi:cx="703.04071" + sodipodi:type="arc" + id="path819-8-6" + style="fill:#191919;fill-opacity:1;stroke-width:1.78393;filter:url(#filter3581-5)" /> + <path + d="m 217.73845,194.81694 a 43.481079,43.481079 0 0 1 -43.26199,43.48053 43.481079,43.481079 0 0 1 -43.69796,-43.04235 43.481079,43.481079 0 0 1 42.82162,-43.91429 43.481079,43.481079 0 0 1 44.1295,42.5998" sodipodi:arc-type="arc" - d="m 217.73845,194.81694 a 43.481079,43.481079 0 0 1 -43.26199,43.48053 43.481079,43.481079 0 0 1 -43.69796,-43.04235 43.481079,43.481079 0 0 1 42.82162,-43.91429 43.481079,43.481079 0 0 1 44.1295,42.5998" /> + sodipodi:open="true" + sodipodi:end="6.2630301" + sodipodi:start="0" + sodipodi:ry="43.481079" + sodipodi:rx="43.481079" + sodipodi:cy="194.81694" + sodipodi:cx="174.25737" + sodipodi:type="arc" + id="path819-3" + style="fill:url(#linearGradient4532-0);fill-opacity:1;stroke-width:0.330834" /> <g id="g3337"> <text - id="text1825-5-8" - y="194.81694" - x="172.20232" + xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.95665px;line-height:1.25;font-family:Play;-inkscape-font-specification:Play;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.148916" - xml:space="preserve"><tspan - style="stroke-width:0.148916" - y="194.81694" - x="172.20232" + x="172.20232" + y="194.81694" + id="text1825-5-8"><tspan + sodipodi:role="line" id="tspan1823-6-5" - sodipodi:role="line"> </tspan></text> + x="172.20232" + y="194.81694" + style="stroke-width:0.148916"> </tspan></text> <circle - style="fill:#000000;fill-opacity:0.996078;fill-rule:nonzero;stroke:none;stroke-width:2.06667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;filter:url(#filter3168)" - id="path3766-8" - cx="1269.061" - cy="48.709526" + transform="matrix(0.61264227,0,0,0.61264227,-603.22306,164.97543)" r="38.447266" - transform="matrix(0.61264227,0,0,0.61264227,-603.22306,164.97543)" /> + cy="48.709526" + cx="1269.061" + id="path3766-8" + style="fill:#000000;fill-opacity:0.996078;fill-rule:nonzero;stroke:none;stroke-width:2.06667;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;filter:url(#filter3168)" /> <g - id="g2933" - transform="translate(-0.16912973,-2.7675262)"> + transform="translate(-0.16912973,-2.7675262)" + id="g2933"> <circle - style="fill:url(#linearGradient2918);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26613;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" - id="path3766" - cx="174.25737" + r="23.55442" cy="197.64726" - r="23.55442" /> + cx="174.25737" + id="path3766" + style="fill:url(#linearGradient2918);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.26613;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> <ellipse - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" - id="path3794" - cx="164.32909" - cy="191.02161" + ry="3.5370526" rx="1.6651245" - ry="3.5370526" /> + cy="191.02161" + cx="164.32909" + id="path3794" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> <ellipse - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" - id="path3794-1" - cx="183.73766" - cy="190.92998" + ry="3.5370526" rx="1.6651245" - ry="3.5370526" /> + cy="190.92998" + cx="183.73766" + id="path3794-1" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78783;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> <g - id="g1035" - transform="translate(4.4158622,31.006934)"> + transform="translate(4.4158622,31.006934)" + id="g1035"> <rect - y="157.49884" - x="142.70897" - height="20.71139" - width="6.2427411" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0851603;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" id="rect3680" - style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0851603;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + width="6.2427411" + height="20.71139" + x="142.70897" + y="157.49884" /> <path - d="m 1259.0482,-58.817824 c 0.568,-19.184701 17.5934,-34.020666 36.5069,-33.357732 16.1054,0.564507 30.1652,11.938063 34.7034,27.298741" - transform="matrix(0.68412502,0.09907965,-0.0858267,0.8299174,-720.64463,86.204294)" - sodipodi:t0="0.85191101" - sodipodi:argument="-19.247704" - sodipodi:radius="39.10619" - sodipodi:revolution="3.02601" - sodipodi:expansion="1" - sodipodi:cy="-55.781796" - sodipodi:cx="1292.2246" - id="path3772" + sodipodi:type="spiral" style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none" - sodipodi:type="spiral" /> + id="path3772" + sodipodi:cx="1292.2246" + sodipodi:cy="-55.781796" + sodipodi:expansion="1" + sodipodi:revolution="3.02601" + sodipodi:radius="39.10619" + sodipodi:argument="-19.247704" + sodipodi:t0="0.85191101" + transform="matrix(0.68412502,0.09907965,-0.0858267,0.8299174,-720.64463,86.204294)" + d="m 1259.0482,-58.817824 c 0.568,-19.184701 17.5934,-34.020666 36.5069,-33.357732 16.1054,0.564507 30.1652,11.938063 34.7034,27.298741" /> <rect - y="156.7856" - x="191.06956" - height="20.71139" - width="6.2427411" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0851603;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" id="rect3680-6" - style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0851603;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" /> + width="6.2427411" + height="20.71139" + x="191.06956" + y="156.7856" /> </g> </g> </g> @@ -30,7 +30,8 @@ int main(int argc, char *argv[]) qDebug() << "Creating files..."; - //QDir directory(QDir::homePath() + "/.alee-productions/AleePlayer"); + //Change this to appdata or .local/share in linux + //QDir directory(QDir::homePath() + "/.alee-productions/Alee Audio Player"); //File file(directory.absoluteFilePath("test.txt")); @@ -48,8 +48,11 @@ void Player::loadFile() if (fileref->tag() != nullptr) { TagLib::String title = fileref->tag()->title(); + TagLib::String artist = fileref->tag()->artist(); const char* title_ = title.to8Bit(true).c_str(); + const char* artist_ = artist.to8Bit(true).c_str(); ui->labelTitle->setText(title_); + ui->labelAuthor->setText(artist_); } return; @@ -37,6 +37,7 @@ public: Player(QWidget *parent = nullptr); ~Player(); QMediaPlayer* mPlayer = new QMediaPlayer(); + QString mFile; int amount = 0; @@ -66,7 +67,6 @@ private slots: private: Ui::Player *ui; - QString mFile; QStringListModel *model; }; #endif // PLAYER_H @@ -13,6 +13,10 @@ <property name="windowTitle"> <string>Alee Audio Player</string> </property> + <property name="windowIcon"> + <iconset> + <normaloff>AAP.svg</normaloff>AAP.svg</iconset> + </property> <widget class="QWidget" name="centralwidget"> <layout class="QGridLayout" name="gridLayout"> <item row="4" column="1"> @@ -159,6 +163,18 @@ </property> </spacer> </item> + <item row="6" column="0"> + <widget class="QLabel" name="labelAuthor"> + <property name="font"> + <font> + <pointsize>12</pointsize> + </font> + </property> + <property name="text"> + <string>Author</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -181,11 +197,6 @@ <addaction name="separator"/> <addaction name="actionQuit"/> </widget> - <widget class="QMenu" name="menuView"> - <property name="title"> - <string>View</string> - </property> - </widget> <widget class="QMenu" name="menuHelp"> <property name="title"> <string>Help</string> @@ -193,7 +204,6 @@ <addaction name="actionAbout"/> </widget> <addaction name="menuFile"/> - <addaction name="menuView"/> <addaction name="menuHelp"/> </widget> <widget class="QStatusBar" name="statusbar"/> diff --git a/scripts/appveyor.bat b/scripts/appveyor.bat index f6a20fd..6326e9e 100644 --- a/scripts/appveyor.bat +++ b/scripts/appveyor.bat @@ -8,7 +8,7 @@ set QTDIR=C:\Qt\5.12\msvc2017_64 set PATH=%PATH%;%QTDIR%\bin call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -qmake Alee Audio Player.pro "CONFIG+=release" +qmake "Alee Audio Player.pro" "CONFIG+=release" nmake release mkdir deploy copy release\AleeAudioPlayer.exe deploy |
