Commit graph

20 commits

Author SHA1 Message Date
Ryan Huffman
5ece424a45 Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/ui/runningScriptsWidget.ui
2014-06-24 20:27:44 -07:00
Mohammed Nafees
a69c6f8e29 Change pt to px to solve the Windows font size issue 2014-06-19 23:58:31 +05:30
Ryan Huffman
0877f9f159 Fix issues with running scripts window on Windows
Replace running scripts table with a new widget that uses a proper
layout that doesn't rely on hard-coded sizing.  Custom painted lines
were replaced with a horizontal QFrame line.
2014-06-17 20:19:49 -07:00
Mohammed Nafees
8b0212dc1e remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
Ryan Huffman
e21a7524c6 Update runningscripts style 2014-05-21 17:03:19 -07:00
Ryan Huffman
cfb1e5ac4e Merge branch 'master' of git://github.com/highfidelity/hifi into 19644
Conflicts:
	interface/ui/runningScriptsWidget.ui
2014-05-14 17:33:47 -07:00
Ryan Huffman
03f9c0c7e2 Update Running Scripts Widget to use ScriptModel 2014-05-14 01:42:24 -07:00
Ryan Huffman
ef67a72f23 Remove icon paths from runningScriptsWidget.ui
These icon paths are already set programmatically.
2014-05-08 07:22:55 -07:00
Ryan Huffman
5a8a78e7b8 Update location of Load Script button 2014-04-25 10:14:18 -07:00
Ryan Huffman
a86af6b07f Add Load Script button to RunningScripts Dialog 2014-04-24 14:05:09 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Atlante45
100c3f8da4 Modify UIs that were using the qrc 2014-04-11 11:59:23 -07:00
Mohammed Nafees
136b91feb5 Align the buttons text properly 2014-04-05 01:32:21 +05:30
Mohammed Nafees
7b5c733d9e Fixed spacing of number and script name in recently loaded list. 2014-04-05 01:10:02 +05:30
Mohammed Nafees
eae95a57b7 UI alignment changes 2014-04-04 23:12:56 +05:30
Mohammed Nafees
1ecdec7a5e Minor changes. Added a sweet tooltip :) 2014-04-04 19:52:37 +05:30
Mohammed Nafees
f3121e1bf6 Removed the animation, placed UI elements according to mockup 2014-04-03 22:33:45 +05:30
Mohammed Nafees
e5d9812742 Major changes to the running scripts widget 2014-04-03 13:21:27 +05:30
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Mohammed Nafees
d85d4fea5d Added the new Running Scripts widget 2014-04-02 12:46:57 +05:30