Ryan Huffman
edcff0b67f
Merge remote-tracking branch 'upstream/master' into RunningScripts
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/FramelessDialog.cpp
interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -07:00
Ryan Huffman
24350761ac
Update layout of login messages and move text to .ui file
2014-04-28 13:16:50 -07:00
Ryan Huffman
d5d440eec5
Update font on login window
2014-04-28 12:04:28 -07:00
Ryan Huffman
45fdd00608
Merge remote-tracking branch 'upstream/master' into 19598
...
Conflicts:
interface/src/ui/FramelessDialog.h
2014-04-28 09:13:00 -07:00
Ryan Huffman
01f66420de
Fix issue with icon being disabled on login window while authenticating
2014-04-28 09:11:09 -07:00
Ryan Huffman
23397a4b10
Add LoginDialog
2014-04-28 08:55:03 -07:00
Ryan Huffman
5a8a78e7b8
Update location of Load Script button
2014-04-25 10:14:18 -07:00
Ryan Huffman
84e7b1598c
Merge remote-tracking branch 'upstream/master' into RunningScripts
2014-04-25 08:45:54 -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
Ryan Huffman
b0e1eab7ed
Fix chat input textbox to use native scrollbar
...
The border around the textedit was causing QT to use a non-native
scrollbar. Moving the box into a frame that contains the border styling
fixes this.
2014-04-23 16:15:51 -07:00
Ryan Huffman
95357a7c35
Update chat input area to use a 14pt font
2014-04-23 12:30:40 -07:00
Ryan Huffman
951d5004e1
Add ChatInputArea with custom paste
2014-04-23 11:57:43 -07:00
Ryan Huffman
c65d5f08ca
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-23 10:54:51 -07:00
U-Uthoypia\Thijs
0e28ff2fcd
This should fix the ubuntu build
2014-04-21 06:33:20 +02:00
Thijs Wenker
c016d6557e
- few Adjustments in Application class for Script editor
...
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
Ryan Huffman
f2112c665a
Disallow rich text from being pasted into the chat area
2014-04-17 14:02:21 -07:00
Ryan Huffman
3ee613b9d5
Add right margin to user list area in chat
2014-04-17 13:20:17 -07:00
Ryan Huffman
c1fa6b41e4
Update chat window to use vertical layout
2014-04-17 13:19:36 -07:00
Ryan Huffman
2de9848a37
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-16 14:42:20 -07:00
Ryan Huffman
cb1408d26d
Update chat window to use new Frameless Dialog
...
The new dialog class needed to be updated to handle windows in different
positions and windows that don't delete on close.
2014-04-16 10:01:35 -07:00
Ryan Huffman
4afea2d228
Remove chat window docking
2014-04-16 09:55:12 -07:00
Thijs Wenker
8e6130091d
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-16 11:28:46 +02:00
Thijs Wenker
e66822c6ee
ScriptEditor: Syntax highlighting update
2014-04-16 00:55:06 +02:00
Stojce Slavkovski
05023a2585
Snapshot preferences title
2014-04-15 23:29:28 +02:00
Stojce Slavkovski
1a3e6595c5
Allow users to set the destination of Snapshots
2014-04-15 19:36:02 +02:00
Thijs Wenker
1634e574d7
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-15 00:40:48 +02:00
Thijs Wenker
af47510b05
Initial script editor widget / icons made by MaximillianMerlin ty
2014-04-15 00:30:01 +02:00
Ryan Huffman
f698f3375a
Update resource urls for chat window close button
2014-04-14 11:34:27 -07:00
Ryan Huffman
aaddecd024
Merge remote-tracking branch 'upstream/master' into 19554
...
Conflicts:
interface/resources/resources.qrc
interface/ui/chatWindow.ui
2014-04-14 11:20:49 -07:00
Atlante45
c39434f4e3
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources
...
Conflicts:
interface/resources/resources.qrc
2014-04-11 12:08:17 -07:00
Atlante45
100c3f8da4
Modify UIs that were using the qrc
2014-04-11 11:59:23 -07:00
Philip Rosedale
8ccc0a2081
Merge pull request #2650 from thoys/chatwindow-docking-feature
...
Fixed docking of ChatWindow
2014-04-11 07:21:53 -07:00
Stojce Slavkovski
3af3b29588
removed dependency on QT resource
2014-04-11 00:54:54 +02:00
Thijs Wenker
f0463a5679
Fixed docking of ChatWindow
...
Temporary Pin Icon, replace with a nice looking one please
2014-04-11 00:45:38 +02:00
Ryan Huffman
de475ee46c
Update behavior of chat window close button
...
Use a stylesheet to suppress highlighting of the background when
pressing the button down. Instead, it will change the image.
Unfortunately I wasn't able to find a way to do this without requiring
an extra image, or by doing it through the icon system. The different
icon states didn't seem to take effect for button presses, and using
opacity in the stylesheet doesn't work yet for `QPushButton`s.
2014-04-10 12:19:27 -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
stojce
8dc6ca75a4
Merge branch 'master' of https://github.com/worklist/hifi into 19508
...
Conflicts:
interface/interface_en.ts
interface/resources/resources.qrc
interface/src/Menu.cpp
2014-04-04 21:16:29 +02:00
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
Dimitar Dobrev
3907c563df
Put the chat window above the 3D view and animated its showing.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
e27f191413
Changed the dock widget for the chat so that it replicates the agreed
...
upon design.
2014-03-28 18:36:53 +02:00
Dimitar Dobrev
d764ef79ed
Gave more space to the user in sent messages so that resizing of the
...
column for messages occurs for really long user names.
2014-03-28 18:36:53 +02:00
stojce
8b6db350da
Switched to QDockWidget
2014-03-27 21:50:41 +01:00
stojce
32502d7b0d
layout improvements
2014-03-23 16:20:29 +01:00
